- updated to 1.6.1

- updated pngminus patch

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 5cf2f74c3fee4e6aae1acb9b04ab31d280238023..715b82f19b98767529a9c68a61ce3ee6080ccfb8 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,11 +1,11 @@
 --- libpng-1.5.7/contrib/pngminus/makefile.std.orig    2011-12-15 16:45:32.000000000 +0100
 +++ libpng-1.5.7/contrib/pngminus/makefile.std 2011-12-18 16:24:38.099367091 +0100
 @@ -12,20 +12,20 @@
- #PNGLIB = -L$(PNGPATH)/lib -lpng15
- #PNGLIBS = $(PNGPATH)/lib/libpng15.a
+ #PNGLIB = -L$(PNGPATH)/lib -lpng16
+ #PNGLIBS = $(PNGPATH)/lib/libpng16.a
  PNGINC = -I../..
 -PNGLIB = -L../.. -lpng
-+PNGLIB = -L../.. -L../../.libs -lpng15
++PNGLIB = -L../.. -L../../.libs -lpng16
  PNGLIBS = ../../libpng.a
  
  #ZPATH = /usr/local

diff --git a/libpng.spec b/libpng.spec
index ab3efaa71f57b3acfe425bd17f5c854d47f50084..f38ba0325ec6475511a764da0f6555017c85378d 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,3 +1,7 @@
+# TODO (when we decide we're ready for 1.5.x -> 1.6.x switch):
+# - copy libpng.git tree to libpng15.git
+# - on libpng15.git master switch default_libpng to off
+# - merge libpng.git libpng-1.6 branch to master
 #
 # Conditional build:
 %bcond_without tests           # don't perform "make check"
@@ -11,16 +15,16 @@ Summary(pl.UTF-8):  Biblioteka PNG
 Summary(pt_BR.UTF-8):  Biblioteca PNG
 Summary(tr.UTF-8):     PNG kitaplığı
 Name:          libpng
-Version:       1.5.15
+Version:       1.6.1
 Release:       1
 Epoch:         2
 License:       distributable
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5: e3122e7b5b5c36c034a4624c65f8a9d8
+# Source0-md5: 93fc0b0841ce2db0e6756673e22dafc3
 Patch0:                %{name}-pngminus.patch
-Patch1:                http://downloads.sourceforge.net/libpng-apng/%{name}-1.5.15-apng.patch.gz
-# Patch1-md5:  3ae9ea7e4bd201f0b25e25cd6049b094
+Patch1:                http://downloads.sourceforge.net/libpng-apng/%{name}-1.6.1-apng.patch.gz
+# Patch1-md5:  39c34060c2f0e48f3849dcdbd4a16b7a
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: tar >= 1:1.22
@@ -184,17 +188,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ANNOUNCE CHANGES LICENSE README TODO
-%attr(755,root,root) %{_libdir}/libpng15.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpng15.so.15
+%attr(755,root,root) %{_libdir}/libpng16.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpng16.so.16
 
 %files devel
 %defattr(644,root,root,755)
 %doc libpng-manual.txt
-%attr(755,root,root) %{_bindir}/libpng15-config
-%attr(755,root,root) %{_libdir}/libpng15.so
-%{_libdir}/libpng15.la
-%{_includedir}/libpng15
-%{_pkgconfigdir}/libpng15.pc
+%attr(755,root,root) %{_bindir}/libpng16-config
+%attr(755,root,root) %{_libdir}/libpng16.so
+%{_libdir}/libpng16.la
+%{_includedir}/libpng16
+%{_pkgconfigdir}/libpng16.pc
 %{_examplesdir}/%{name}-%{version}
 %if %{with default_libpng}
 %attr(755,root,root) %{_bindir}/libpng-config
@@ -209,7 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng15.a
+%{_libdir}/libpng16.a
 %if %{with default_libpng}
 %{_libdir}/libpng.a
 %endif