From 77e2f42be4cc8d89a5f32d71566e26b10fea9bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@fedoraproject.org>
Date: Fri, 31 May 2013 01:51:09 +0200
Subject: [PATCH] update to 1.7.59

---
 .gitignore           |  1 +
 pngcrush-build.patch | 17 -----------------
 pngcrush.spec        | 34 +++++++++++++++++++---------------
 sources              |  2 +-
 4 files changed, 21 insertions(+), 33 deletions(-)
 delete mode 100644 pngcrush-build.patch

diff --git a/.gitignore b/.gitignore
index de6a084..bd3dc8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pngcrush-1.6.10.tar.bz2
 /pngcrush-1.7.35.tar.xz
 /pngcrush-1.7.43.tar.xz
+/pngcrush-1.7.59.tar.xz
diff --git a/pngcrush-build.patch b/pngcrush-build.patch
deleted file mode 100644
index 95efede..0000000
--- a/pngcrush-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- pngcrush.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: pngcrush-1.6.10/pngcrush.c
-===================================================================
---- pngcrush-1.6.10.orig/pngcrush.c
-+++ pngcrush-1.6.10/pngcrush.c
-@@ -2821,7 +2821,7 @@ int main(int argc, char *argv[])
- #if !defined(PNG_cHRM_SUPPORTED) || !defined(PNG_hIST_SUPPORTED) || \
-     !defined(PNG_iCCP_SUPPORTED) || !defined(PNG_sCAL_SUPPORTED) || \
-     !defined(PNG_pCAL_SUPPORTED) || !defined(PNG_sPLT_SUPPORTED) || \
--    !defined(PNG_tIME_SUPPORTED)
-+    !defined(PNG_sTER_SUPPORTED) || !defined(PNG_tIME_SUPPORTED)
-                         png_byte chunk_name[5];
-                         chunk_name[4] = '\0';
- #endif
diff --git a/pngcrush.spec b/pngcrush.spec
index 3a4b4c8..41121fa 100644
--- a/pngcrush.spec
+++ b/pngcrush.spec
@@ -1,20 +1,20 @@
-Summary: Optimizer for PNG (Portable Network Graphics) files
-Name: pngcrush
-Version: 1.7.43
-Release: 2%{?dist}
-License: zlib
-Group: Applications/File
-URL: http://pmt.sourceforge.net/pngcrush/
-Source0: http://downloads.sourceforge.net/pmt/%{name}-%{version}.tar.xz
 
-# sent upstream 2008-10-31 (mailto:glennrp@users.sf.net)
-#Patch0: %{name}-build.patch
+%global         _hardened_build 1
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libpng-devel, zlib-devel, pkgconfig
+Summary:        Optimizer for PNG (Portable Network Graphics) files
+Name:           pngcrush
+Version:        1.7.59
+Release:        1%{?dist}
+License:        zlib
+Group:          Applications/File
+URL:            http://pmt.sourceforge.net/pngcrush/
+Source0:        http://downloads.sourceforge.net/pmt/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  libpng-devel, zlib-devel, pkgconfig
 
 %description
-pngcrush is an optimizer for PNG (Portable Network Graphics) files. It can be
+%{pngcrush} is an optimizer for PNG (Portable Network Graphics) files. It can be
 run from a commandline in an MSDOS window, or from a UNIX or LINUX commandline.
 
 Its main purpose is to reduce the size of the PNG IDAT datastream by trying
@@ -24,7 +24,6 @@ tRNS, iCCP, and textual chunks.
 
 %prep
 %setup -q
-#%patch0 -p1
 
 %build
 rm -f z*.h crc32.h deflate.h inf*.h trees.h png*.h # force using system headers
@@ -41,9 +40,14 @@ gcc %{optflags} $pngflags -lz -o pngcrush pngcrush.c
 %files
 %defattr(-, root, root, -)
 %doc ChangeLog.html
-%{_bindir}/pngcrush
+%{_bindir}/%{name}
 
 %changelog
+* Fri May 31 2013 François Cami <fcami@fedoraproject.org> - 1.7.59-1
+- New upstream release.
+- Use more macros.
+- Switch to hardened build.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.43-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index c779e74..e69e963 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd497cea44b99f18ce403c19a67ffea2  pngcrush-1.7.43.tar.xz
+865224158ddd216f30887ca097cea738  pngcrush-1.7.59.tar.xz