rpms/popt/F-9 popt.spec,1.4,1.5

[Robert Scheck (robert)]

Author: robert

Update of /cvs/pkgs/rpms/popt/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28781/F-9

Modified Files:
	popt.spec 
Log Message:
Solved multilib problems at doxygen generated files (#342921)



Index: popt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/popt/F-9/popt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- popt.spec	20 Feb 2008 09:10:05 -0000	1.4
+++ popt.spec	25 May 2008 15:59:50 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	C library for parsing command line parameters
 Name:		popt
 Version:	1.13
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	MIT
 Group:		System Environment/Libraries
 URL:		http://www.rpm5.org/
@@ -9,7 +9,7 @@
 Source1:	http://people.redhat.com/jantill/fedora/png-mtime.py
 Patch0:		popt-1.13-multilib.patch
 Patch1:		popt-1.13-popt_fprintf.patch
-BuildRequires:	gettext, doxygen, graphviz, freefont
+BuildRequires:	gettext, doxygen, graphviz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -53,7 +53,9 @@
 
 # Solve multilib problems by changing the internal PNG timestamp to a reference timestamp;
 # see http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks for further information.
-for png in doxygen/html/*{__,graph_legend}*.png; do python %{SOURCE1} $png CHANGES; done
+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
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -97,6 +99,9 @@
 %{_libdir}/libpopt.a
 
 %changelog
+* Sun May 25 2008 Robert Scheck <robert at fedoraproject.org> 1.13-4
+- Solved multilib problems at doxygen generated files (#342921)
+
 * Wed Feb 20 2008 Robert Scheck <robert at fedoraproject.org> 1.13-3
 - Revert the broken bind_textdomain_codeset() patch (#433324)