diff --git a/libwpg-0.1.3-nodate.patch b/libwpg-0.1.3-nodate.patch new file mode 100644 index 0000000..3c7d9d0 --- /dev/null +++ b/libwpg-0.1.3-nodate.patch @@ -0,0 +1,14 @@ +Avoid multilib conflict in Doxygen documentation with timestamp. + +Lubomir Rintel + +diff -up libwpg-0.1.3/docs/doxygen/footer.html.in.nodate libwpg-0.1.3/docs/doxygen/footer.html.in +--- libwpg-0.1.3/docs/doxygen/footer.html.in.nodate 2009-07-28 18:16:27.000000000 +0200 ++++ libwpg-0.1.3/docs/doxygen/footer.html.in 2009-07-28 18:17:06.000000000 +0200 +@@ -1,5 +1,5 @@ +
+-Generated on $datetime for $projectname by ++Generated for $projectname by + doxygen $doxygenversion
+ + diff --git a/libwpg.spec b/libwpg.spec index e9d51cf..54e0ed9 100644 --- a/libwpg.spec +++ b/libwpg.spec @@ -1,12 +1,13 @@ Name: libwpg Version: 0.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for reading WordPerfect Graphics images Group: System Environment/Libraries License: GPLv2+ URL: http://libwpg.sourceforge.net/ Source0: http://download.sourceforge.net/libwpg/%{name}-%{version}.tar.bz2 +Patch0: libwpg-0.1.3-nodate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libwpd-devel >= 0.8 @@ -40,12 +41,14 @@ such as WordPerfect and Presentations. %prep %setup -q +%patch0 -p1 -b .nodate %build %configure make %{?_smp_mflags} sed 's/\r//' -i ChangeLog +find docs/doxygen/html |xargs touch -r docs/doxygen/doxygen.cfg %install @@ -86,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 28 2009 Lubomir Rintel - 0.1.3-4 +- Fix multilib problem with doxygen documentation (#508940) + * Sat Jul 25 2009 Fedora Release Engineering - 0.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild