[libpng] Don't include libpng12.pc in the compat subpackage

[Tom Lane]

commit 05c227271ba7fbbccc89a47def722bad0accabbc
Author: Tom Lane <tgl at redhat.com>
Date:   Mon Nov 21 22:31:13 2011 -0500

    Don't include libpng12.pc in the compat subpackage

 libpng.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/libpng.spec b/libpng.spec
index 585ac1a..2316a82 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -2,7 +2,7 @@ Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
 Version: 1.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -40,6 +40,9 @@ Summary: Development tools for programs to manipulate PNG image format files
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: zlib-devel pkgconfig
+# TEMPORARILY pretend that we supply libpng12.pc; this is just to avoid
+# dependency failures during the rebuild cycle for libpng 1.5
+Provides: pkgconfig(libpng12) = 1.2.46
 
 %description devel
 The libpng-devel package contains header files and documentation necessary
@@ -92,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 	rm -rf $RPM_BUILD_ROOT%{_bindir}
 	rm -rf $RPM_BUILD_ROOT%{_includedir}
 	rm -rf $RPM_BUILD_ROOT%{_mandir}
-	rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libpng.pc
+	rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libpng*.pc
 	rm -f $RPM_BUILD_ROOT%{_libdir}/libpng*.so
 	rm -f $RPM_BUILD_ROOT%{_libdir}/libpng*.a
 	rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -121,8 +124,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/libpng*.so
-%{_libdir}/pkgconfig/libpng.pc
-%{_libdir}/pkgconfig/libpng15.pc
+%{_libdir}/pkgconfig/libpng*.pc
 %{_mandir}/man3/*
 
 %files static
@@ -133,12 +135,15 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %defattr(-,root,root)
 %{_libdir}/libpng.so.3*
 %{_libdir}/libpng12.so.*
-%{_libdir}/pkgconfig/libpng12.pc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Nov 21 2011 Tom Lane <tgl at redhat.com> 2:1.5.6-2
+- Don't include libpng12.pc in the compat subpackage; instead just offer a
+  phony Provides: for it in the devel subpackage
+
 * Sat Nov  5 2011 Tom Lane <tgl at redhat.com> 2:1.5.6-1
 - Update to new major release series 1.5.x; includes source-code-incompatible
   API changes and a soname version bump