1.2.50-5

- -devel: fix so we can drop Conflicts: libpng-devel
- drop libpng-compat stuff

libpng12.spec

@@ -1,7 +1,7 @@
 Summary: Old version of libpng, needed to run old binaries
 Name: libpng12
 Version: 1.2.50
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -29,7 +29,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
@@ -42,37 +41,49 @@ for developing programs using libpng12.
 %patch1 -p1
 
 %build
-%configure
+%configure \
+  --disable-static \
+  --without-libpng-compat
+
 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,
+rm -fv $RPM_BUILD_ROOT%{_libdir}/libpng*.la
+# 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%{_mandir}/man5/*
+# 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
+rm -fv $RPM_BUILD_ROOT%{_mandir}/man3/{libpng,libpngpf}.3*
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%doc *.txt example.c README TODO CHANGES LICENSE 
-%{_libdir}/libpng*.so.*
+%doc LICENSE
+%doc libpng-%{version}.txt README TODO CHANGES
+%{_libdir}/libpng12.so.0*
 
 %files devel
-%{_bindir}/*
-%{_includedir}/*
-%{_libdir}/libpng*.so
-%{_libdir}/pkgconfig/*
-%{_mandir}/man3/*
+#doc example.c
+%{_bindir}/libpng12-config
+%{_includedir}/libpng12/
+%{_libdir}/libpng12.so
+%{_libdir}/pkgconfig/libpng12.pc
 
 %changelog
+* Sun Aug 18 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.2.50-5
+- -devel: fix so we can drop Conflicts: libpng-devel
+- drop libpng-compat stuff
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.50-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild