Solved multilib problems at doxygen generated files (#517509)

.cvsignore

@@ -1,2 +1 @@
 popt-1.13.tar.gz
-png-mtime.py

popt.spec

@@ -1,12 +1,11 @@
 Summary:	C library for parsing command line parameters
 Name:		popt
 Version:	1.13
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	MIT
 Group:		System Environment/Libraries
 URL:		http://www.rpm5.org/
-Source0:	http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
-Source1:	http://people.redhat.com/jantill/fedora/png-mtime.py
+Source:		http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
 Patch0:		popt-1.13-multilib.patch
 Patch1:		popt-1.13-popt_fprintf.patch
 BuildRequires:	gettext, doxygen, graphviz
@@ -51,14 +50,6 @@ Install it if you need to link statically with libpopt.
 make %{?_smp_mflags}
 doxygen
 
-%if 0%{?fedora} < 10
-# Solve multilib problems by changing the internal PNG timestamp to a reference timestamp;
-# see http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks for further information.
-if [ $(ls doxygen/html/*{__,graph_legend}*.png 2> /dev/null | wc -l) -gt 0 ]; then
-  for png in doxygen/html/*{__,graph_legend}*.png; do python %{SOURCE1} $png CHANGES; done
-fi
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -101,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpopt.a
 
 %changelog
+* Tue Feb 16 2010 Robert Scheck <robert@fedoraproject.org> 1.13-7
+- Solved multilib problems at doxygen generated files (#517509)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1,2 +1 @@
 b5c47ce0185c83f947953c77000533bf  popt-1.13.tar.gz
-2fe94a35ebc84b35e8d9405215bbf89d  png-mtime.py