From 3358ced82de493bf202b759155bce54c21771ce6 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Tue, 5 Jan 2010 10:41:34 +0000
Subject: [PATCH] upgrading package: png 1.2.41 -> 1.4.0

---
 png/png.patch | 55 +++++++++++++++++++++++++++------------------------
 png/png.spec  |  6 +++---
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/png/png.patch b/png/png.patch
index 64b6600006..c31738665f 100644
--- a/png/png.patch
+++ b/png/png.patch
@@ -1,7 +1,33 @@
+Index: libpng-config.in
+--- libpng-config.in.orig	2010-01-03 06:05:36 +0100
++++ libpng-config.in	2010-01-05 10:18:54 +0100
+@@ -16,8 +16,8 @@
+ exec_prefix="@exec_prefix@"
+ libdir="@libdir@"
+ includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
+-libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
+-all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
++libs="-lpng"
++all_libs="-lpng -lz @LIBS@"
+ I_opts="-I${includedir}"
+ L_opts="-L${libdir}"
+ R_opts=""
+Index: libpng.pc.in
+--- libpng.pc.in.orig	2010-01-03 06:05:36 +0100
++++ libpng.pc.in	2010-01-05 10:18:04 +0100
+@@ -6,6 +6,6 @@
+ Name: libpng
+ Description: Loads and saves PNG files
+ Version: @PNGLIB_VERSION@
+-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
+-Libs.private: @LIBS@
++Libs: -L${libdir} -lpng
++Libs.private: -lz @LIBS@
+ Cflags: -I${includedir}
 Index: pngconf.h
---- pngconf.h.orig	2009-05-07 18:05:28 +0200
-+++ pngconf.h	2009-05-08 10:22:24 +0200
-@@ -331,9 +331,9 @@
+--- pngconf.h.orig	2010-01-03 06:05:36 +0100
++++ pngconf.h	2010-01-05 10:18:04 +0100
+@@ -360,9 +360,9 @@
  #      ifdef _SETJMP_H
         /* If you encounter a compiler error here, see the explanation
          * near the end of INSTALL.
@@ -12,26 +38,3 @@ Index: pngconf.h
  #      endif
  #    endif /* __linux__ */
  #  endif /* PNG_SKIP_SETJMP_CHECK */
-Index: scripts/libpng.pc-configure.in
---- scripts/libpng.pc-configure.in.orig	2008-05-29 19:39:19 +0200
-+++ scripts/libpng.pc-configure.in	2009-05-08 10:21:50 +0200
-@@ -6,6 +6,6 @@
- Name: libpng
- Description: Loads and saves PNG files
- Version: @PNGLIB_VERSION@
--Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
--Libs.private: @LIBS@
-+Libs: -L${libdir} -lpng
-+Libs.private: -lz @LIBS@
- Cflags: -I${includedir} @LIBPNG_NO_MMX@
-Index: scripts/libpng.pc.in
---- scripts/libpng.pc.in.orig	2009-05-07 18:05:35 +0200
-+++ scripts/libpng.pc.in	2009-05-08 10:21:50 +0200
-@@ -6,5 +6,6 @@
- Name: libpng
- Description: Loads and saves PNG files
- Version: 1.2.41
--Libs: -L${libdir} -lpng12
-+Libs: -L${libdir} -lpng
-+Libs.private: -lz
- Cflags: -I${includedir}
diff --git a/png/png.spec b/png/png.spec
index 944852e4d7..830c95051d 100644
--- a/png/png.spec
+++ b/png/png.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Graphics
 License:      BSD
-Version:      1.2.41
-Release:      20091203
+Version:      1.4.0
+Release:      20100105
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/sourceforge/libpng/libpng-%{version}.tar.gz
@@ -77,7 +77,7 @@ AutoReqProv:  no
     ./configure \
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man \
-        --with-libpng-compat \
+        --with-binconfigs \
         --disable-shared
     %{l_make} %{l_mflags}