From e65717ab5dbb2cbef3983c71e992fbd0ead92ad0 Mon Sep 17 00:00:00 2001
From: Till Maas <till@fedoraproject.org>
Date: Tue, 6 Feb 2007 17:18:30 +0000
Subject: [PATCH] version bump

---
 .cvsignore                           |  2 +-
 optipng-0.5.4-makefile-destdir.patch | 29 ----------------------------
 optipng.spec                         | 25 ++++++++++++------------
 optipngr.txt                         | 14 --------------
 sources                              |  2 +-
 5 files changed, 14 insertions(+), 58 deletions(-)
 delete mode 100644 optipng-0.5.4-makefile-destdir.patch
 delete mode 100644 optipngr.txt

diff --git a/.cvsignore b/.cvsignore
index 794d0f1..8108dbb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-optipng-0.5.4.tar.gz
+optipng-0.5.5.tar.gz
diff --git a/optipng-0.5.4-makefile-destdir.patch b/optipng-0.5.4-makefile-destdir.patch
deleted file mode 100644
index 16367a5..0000000
--- a/optipng-0.5.4-makefile-destdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
---- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 11:55:25.000000000 +0100
-+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 11:56:28.000000000 +0100
-@@ -64,17 +64,17 @@
- 
- 
- install: $(OPTIPNG)
--	-@if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
--	-@if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
--	-@rm -f ${bindir}/$(OPTIPNG)
--	-@rm -f ${man1dir}/optipng.1
--	cp -p $(OPTIPNG) ${bindir}
--	cp -p ../man/optipng.1 ${man1dir}
-+	-@if [ ! -d ${DESTDIR}/${bindir} ]; then mkdir -p ${DESTDIR}/${bindir}; fi
-+	-@if [ ! -d ${DESTDIR}/${man1dir} ]; then mkdir -p ${DESTDIR}/${man1dir}; fi
-+	-@rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
-+	-@rm -f ${DESTDIR}/${man1dir}/optipng.1
-+	cp -p $(OPTIPNG) ${DESTDIR}/${bindir}
-+	cp -p ../man/optipng.1 ${DESTDIR}/${man1dir}
- 
- 
- uninstall:
--	rm -f ${bindir}/$(OPTIPNG)
--	rm -f ${man1dir}/optipng.1
-+	rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
-+	rm -f ${DESTDIR}/${man1dir}/optipng.1
- 
- 
- clean:
diff --git a/optipng.spec b/optipng.spec
index 808c433..5ef58d0 100644
--- a/optipng.spec
+++ b/optipng.spec
@@ -1,15 +1,13 @@
 Name:           optipng
-Version:        0.5.4
-Release:        4%{?dist}
+Version:        0.5.5
+Release:        1%{?dist}
 Summary:        A PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib/libpng
 URL:            http://optipng.sourceforge.net/
 Source0:        http://surfnet.dl.sourceforge.net/sourceforge/optipng/optipng-%{version}.tar.gz
-Patch0:         optipng-0.5.4-makefile-destdir.patch
 Patch1:         optipng-0.5.4-makefile-externlibs.patch
-Patch2:         http://www.icmc.usp.br/~naoliv/optipngr.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel libpng-devel
@@ -23,9 +21,7 @@ integrity checks and corrections.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %define makefile gcc.mak
 
@@ -55,31 +51,34 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Nov 29 2006 Till Maas <opensource[AT]till.name> - 0.5.4-4
+* Tue Feb 06 2007 Till Maas <opensource till name> - 0.5.5-1
+- Version bump
+
+* Wed Nov 29 2006 Till Maas <opensource till name> - 0.5.4-4
 - splitting makefile patches
 - make LDFLAGS=$RPM_OPT_FLAGS
 - Use own makefile define
 - Fixing 216784 with upstream patch
 
-* Wed Oct 11 2006 Till Maas <opensource[AT]till.name> - 0.5.4-3
+* Wed Oct 11 2006 Till Maas <opensource till name> - 0.5.4-3
 - bumping release because of errors while importing to extras
 
-* Tue Oct 10 2006 Till Maas <opensource[AT]till.name> - 0.5.4-2
+* Tue Oct 10 2006 Till Maas <opensource till name> - 0.5.4-2
 - shortening Summary
 
-* Thu Sep 14 2006 Till Maas <opensource[AT]till.name> - 0.5.4-1
+* Thu Sep 14 2006 Till Maas <opensource till name> - 0.5.4-1
 - version bump
 - use system zlib and libpng
 - link without "-s" flag for non-empty debuginfo
 - use DESTDIR
 
-* Fri Jul 28 2006 Till Maas <opensource[AT]till.name> - 0.5.3-1
+* Fri Jul 28 2006 Till Maas <opensource till name> - 0.5.3-1
 - version bump
 - Changed license tag back to zlib/libpng (#198616 rpmlint) 
 - use $RPM_OPT_FLAGS instead of %%{optflags}
 
-* Thu Jul 06 2006 Till Maas <opensource[AT]till.name> - 0.5.2-2
+* Thu Jul 06 2006 Till Maas <opensource till name> - 0.5.2-2
 - Changed license tag from zlib/libpng to zlib
 
-* Tue Jul 04 2006 Till Maas <opensource[AT]till.name> - 0.5.2-1
+* Tue Jul 04 2006 Till Maas <opensource till name> - 0.5.2-1
 - Created from scratch for fedora extras
diff --git a/optipngr.txt b/optipngr.txt
deleted file mode 100644
index c0e4c12..0000000
--- a/optipngr.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN optipng-0.5.4.orig/src/opngreduc.c optipng-0.5.4/src/opngreduc.c
---- optipng-0.5.4.orig/src/opngreduc.c	2006-11-28 01:55:45.000000000 -0200
-+++ optipng-0.5.4/src/opngreduc.c	2006-11-28 01:56:54.000000000 -0200
-@@ -80,10 +80,6 @@
-    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
-       if (sig_bit != &info_ptr->sig_bit)
-          goto error;
--   if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values))
--      if (trans != info_ptr->trans || num_trans != info_ptr->num_trans ||
--          trans_values != &info_ptr->trans_values)
--         goto error;
- 
-    /* Also check png_ptr.  (It's not much, but we're doing what we can.) */
-    if (png_get_compression_buffer_size(png_ptr) != png_ptr->zbuf_size)
diff --git a/sources b/sources
index 935a7be..dc78fc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d989971e674a06b55e17fc5b70c41aa  optipng-0.5.4.tar.gz
+9dbc2bb39e39b6ab4ed0c705d8035bdf  optipng-0.5.5.tar.gz