Remove compat subpackage

libpng.spec

@@ -2,27 +2,17 @@ Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
 Version: 1.5.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
 
-# This SRPM includes a copy of libpng 1.2.x, which is provided as a stopgap
-# measure to satisfy dependencies on libpng.so.3 until all applications can
-# be recompiled.  The compatibility library is placed in a separate
-# sub-RPM, libpng-compat.  There is no support for recompiling source code
-# against the old version.
-%global prevversion 1.2.49
-
 # Note: non-current tarballs get moved to the history/ subdirectory,
 # so look there if you fail to retrieve the version you want
 Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
 
-Source1: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{prevversion}.tar.bz2
-
 Patch0: libpng-multilib.patch
 
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel, pkgconfig
 
 %description
@@ -39,10 +29,7 @@ files.
 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) = %{prevversion}
+Requires: zlib-devel%{?_isa} pkgconfig%{?_isa}
 
 %description devel
 The libpng-devel package contains header files and documentation necessary
@@ -62,45 +49,16 @@ The libpng-static package contains the statically linkable version of libpng.
 Linking to static libraries is discouraged for most applications, but it is
 necessary for some boot packages.
 
-%package compat
-Summary: Temporary backwards-compatibility copy of old libpng
-Group: Development/Libraries
-
-%description compat
-This package contains shared libraries (only) for libpng 1.2.x.
-
 %prep
 %setup -q
 
 %patch0 -p1
 
-tar xfj %{SOURCE1}
-
 %build
 %configure
 make %{?_smp_mflags}
 
-# this is for the compat package:
-	pushd libpng-%{prevversion}
-	%configure
-	make %{?_smp_mflags}
-	popd
-
 %install
-rm -rf $RPM_BUILD_ROOT
-
-# install compat package first, then remove unwanted files
-	pushd libpng-%{prevversion}
-	make DESTDIR=$RPM_BUILD_ROOT install
-	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}/libpng*.so
-	rm -f $RPM_BUILD_ROOT%{_libdir}/libpng*.a
-	rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-	popd
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # We don't ship .la files.
@@ -110,17 +68,12 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %postun -p /sbin/ldconfig
 
-%post compat -p /sbin/ldconfig
-%postun compat -p /sbin/ldconfig
-
 %files
-%defattr(-,root,root)
 %doc libpng-manual.txt example.c README TODO CHANGES LICENSE
 %{_libdir}/libpng15.so.*
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-,root,root)
 %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/libpng*.so
@@ -128,18 +81,14 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*
 
 %files static
-%defattr(-,root,root)
 %{_libdir}/libpng*.a
 
-%files compat
-%defattr(-,root,root)
-%{_libdir}/libpng.so.3*
-%{_libdir}/libpng12.so.*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %changelog
+* Wed Aug  1 2012 Tom Lane <tgl@redhat.com> 2:1.5.10-3
+- Remove compat subpackage (it's now a separate package "libpng12")
+- Minor specfile cleanup per suggestions from Tom Callaway
+Related: #845110
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:1.5.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild