From 298c7329323556cdd3d9dd888fdc4fa2e4ecc82f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 06:22:36 +0000
Subject: import libpng12-1.2.50-10.el7


---

diff --git a/SPECS/libpng12.spec b/SPECS/libpng12.spec
index ebe8b45..5d58d95 100644
--- a/SPECS/libpng12.spec
+++ b/SPECS/libpng12.spec
@@ -1,7 +1,7 @@
 Summary: Old version of libpng, needed to run old binaries
 Name: libpng12
 Version: 1.2.50
-Release: 7%{?dist}
+Release: 10%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -32,7 +32,6 @@ Summary: Development files for libpng 1.2
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: zlib-devel%{?_isa} pkgconfig%{?_isa}
-Conflicts: libpng-devel
 
 %description devel
 The libpng12-devel package contains header files and documentation necessary
@@ -48,40 +47,62 @@ for developing programs using libpng12.
 %patch4 -p1
 
 %build
-%configure
+%configure \
+  --disable-static
+
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
+## unpackaged files
 # We don't ship .la files.
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.la
-# We're not providing any static libraries, either.
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
-# Also drop man5 files, because these are in the base libpng package,
-# which we don't want to conflict with.
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man5/*
+rm -fv $RPM_BUILD_ROOT%{_libdir}/libpng*.la
+# rename man page to avoid conflict with base libpng package
+mv $RPM_BUILD_ROOT%{_mandir}/man5/png.5 $RPM_BUILD_ROOT%{_mandir}/man5/png12.5
+# omit that conflicts with base libpng-devel package
+rm -fv $RPM_BUILD_ROOT%{_bindir}/libpng-config
+rm -fv $RPM_BUILD_ROOT%{_includedir}/{png,pngconf}.h
+rm -fv $RPM_BUILD_ROOT%{_libdir}/libpng.so
+rm -fv $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libpng.pc
+# rename man pages to avoid conflict with base libpng-devel package
+mv $RPM_BUILD_ROOT%{_mandir}/man3/libpng.3 $RPM_BUILD_ROOT%{_mandir}/man3/libpng12.3
+mv $RPM_BUILD_ROOT%{_mandir}/man3/libpngpf.3 $RPM_BUILD_ROOT%{_mandir}/man3/libpngpf12.3
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%doc *.txt example.c README TODO CHANGES LICENSE 
+%doc LICENSE
+%doc libpng-%{version}.txt README TODO CHANGES
 %{_libdir}/libpng*.so.*
+%{_mandir}/man5/*
 
 %files devel
-%{_bindir}/*
-%{_includedir}/*
-%{_libdir}/libpng*.so
-%{_libdir}/pkgconfig/*
+%doc example.c
+%{_bindir}/libpng12-config
+%{_includedir}/libpng12/
+%{_libdir}/libpng12.so
+%{_libdir}/pkgconfig/libpng12.pc
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jun 30 2016 Nikola Forró <nforro@redhat.com> - 1.2.50-10
+- Revert removal of libpng compat library
+- Related: #1282628
+
+* Wed Jun 29 2016 Nikola Forró <nforro@redhat.com> - 1.2.50-9
+- Don't drop man pages, but rename them to avoid conflict
+- Resolves: #1285680
+
+* Thu Feb 11 2016 Petr Hracek <phracek@redhat.com> - 1.2.50-8
+- libpng12-devel conflicts with libpng-devel
+- Resolves: #1282628
+
 * Mon Nov 23 2015 Petr Hracek <phracek@redhat.com> - 1.2.50-7
 - Security fix for CVE-2015-7981 and CVE-2015-8126
-- Resolves: #1283576
+- Resolves: #1283577
 
 * Wed Jan 29 2014 Petr Hracek <phracek@redhat.com> - 1.2.50-6
 - Adding patch CVE-2013-6954