From e566c22751469d4a32770d26ed19abb0b7c43c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 2 Mar 2012 23:17:59 +0200
Subject: [PATCH] Update to 0.7.

- Build with $RPM_LD_FLAGS.
---
 .gitignore                         |  2 +-
 optipng-0.6.5-setjmp-include.patch | 17 ----------------
 optipng.spec                       | 32 +++++++++++++++---------------
 sources                            |  2 +-
 4 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 optipng-0.6.5-setjmp-include.patch

diff --git a/.gitignore b/.gitignore
index c4f5673..dafa321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/optipng-0.6.5.tar.gz
+/*.tar.*
diff --git a/optipng-0.6.5-setjmp-include.patch b/optipng-0.6.5-setjmp-include.patch
deleted file mode 100644
index 6b342bf..0000000
--- a/optipng-0.6.5-setjmp-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up optipng-0.6.5/src/opngoptim.c~ optipng-0.6.5/src/opngoptim.c
---- optipng-0.6.5/src/opngoptim.c~	2010-12-22 19:08:00.000000000 +0200
-+++ optipng-0.6.5/src/opngoptim.c	2011-04-28 13:16:11.846000052 +0300
-@@ -19,12 +19,12 @@
- #include "proginfo.h"
- 
- #include "cbitset.h"
--#include "cexcept.h"
- #include "opngreduc.h"
- #include "osys.h"
- #include "png.h"
- #include "pngx.h"
- #include "pngxtern.h"
-+#include "cexcept.h"
- #include "zlib.h"
- 
- 
diff --git a/optipng.spec b/optipng.spec
index e93a9a6..e98f094 100644
--- a/optipng.spec
+++ b/optipng.spec
@@ -1,16 +1,12 @@
-%global makefile gcc.mak
-
 Name:           optipng
-Version:        0.6.5
-Release:        3%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib
 URL:            http://optipng.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
-# http://sf.net/tracker/?func=detail&aid=3294326&group_id=151404&atid=780915
-Patch0:         %{name}-0.6.5-setjmp-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel libpng-devel
@@ -24,26 +20,26 @@ and corrections.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Ensure system libs and headers are used; as of 0.6.3 pngxtern will use
 # the bundled headers if present even with -with-system-*, causing failures.
-rm -rf lib/libpng lib/zlib
+rm -rf src/libpng src/zlib
 
 
 %build
-./configure -with-system-zlib -with-system-libpng
-cd src/
-make -f scripts/%{makefile} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"\
-                                            LDFLAGS="$RPM_OPT_FLAGS"
+./configure -prefix=%{_prefix} -mandir=%{_mandir} \
+    -with-system-zlib -with-system-libpng
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd src/
-make -f scripts/%{makefile} install DESTDIR="$RPM_BUILD_ROOT"\
-                                    prefix="%{_prefix}" \
-                                    man1dir="%{_mandir}/man1"
+make install DESTDIR=$RPM_BUILD_ROOT
+chmod -c 755 $RPM_BUILD_ROOT%{_bindir}/optipng
+
+
+%check
+make test
 
 
 %clean
@@ -58,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar  2 2012 Ville Skyttä <ville.skytta@iki.fi> - 0.7-1
+- Update to 0.7.
+- Build with $RPM_LD_FLAGS.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 7a8549a..f1ed63b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9df5fa7bb45ae096ed6c6e0d8dc43dc7  optipng-0.6.5.tar.gz
+9b2f526ce79ea779c7004c7964ee8bcc  optipng-0.7.tar.gz