- updated to 1.6.20 (fixes CVE-2015-8126)

[packages/libpng.git] / libpng.spec

diff --git a/libpng.spec b/libpng.spec
index ab3efaa71f57b3acfe425bd17f5c854d47f50084..b3865218adfe235df53cf629fb03d88833254188 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,4 +1,3 @@
-#
 # Conditional build:
 %bcond_without tests           # don't perform "make check"
 %bcond_without default_libpng  # don't use this libpng as default system libpng
@@ -11,16 +10,17 @@ 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.20
 Release:       1
 Epoch:         2
 License:       distributable
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5: e3122e7b5b5c36c034a4624c65f8a9d8
+# Source0-md5: 3968acb7c66ef81a9dab867f35d0eb4b
 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}-%{version}-apng.patch.gz
+# Patch1-md5:  b2186d5e7853890e25b34b03c7f2ddde
+Patch2:                %{name}-sh.patch
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: tar >= 1:1.22
@@ -145,6 +145,7 @@ Narzędzia do konwersji plików PNG z lub do plików PNM.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -184,17 +185,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 +210,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
@@ -218,5 +219,7 @@ rm -rf $RPM_BUILD_ROOT
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/png2pnm
+%attr(755,root,root) %{_bindir}/pngfix
+%attr(755,root,root) %{_bindir}/png-fix-itxt
 %attr(755,root,root) %{_bindir}/pnm2png
 %endif