From d8674363caad3dc717c253a36e733b766c199691 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 25 May 2008 16:00:02 +0000 Subject: [PATCH] Solved multilib problems at doxygen generated files (#342921) --- popt.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/popt.spec b/popt.spec index 637ef07..f406b14 100644 --- a/popt.spec +++ b/popt.spec @@ -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 @@ Source0: http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz 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 @@ doxygen # 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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libpopt.a %changelog +* Sun May 25 2008 Robert Scheck 1.13-4 +- Solved multilib problems at doxygen generated files (#342921) + * Wed Feb 20 2008 Robert Scheck 1.13-3 - Revert the broken bind_textdomain_codeset() patch (#433324)