From 24f6b23237c402e43259c475f7cc8f78d9907a3d Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Oct 24 2007 09:38:30 +0000 Subject: Fix multiarch issue with Doxygen generated documentation. --- diff --git a/libnjb.spec b/libnjb.spec index f1f2ffd..7bf6a66 100644 --- a/libnjb.spec +++ b/libnjb.spec @@ -3,7 +3,7 @@ Name: libnjb Version: 2.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software library for talking to the Creative Nomad Jukeboxes and Dell DJs URL: http://libnjb.sourceforge.net/ @@ -72,6 +72,17 @@ install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10fr # Copy documentation to a good place install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \ INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +# Touch generated files to make them always have the same time stamp. +touch -r configure.ac \ + $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/* \ + $RPM_BUILD_ROOT%{_includedir}/*.h \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc +# Remove the Doxygen HTML documentation, this get different +# each time it is generated and thus creates multiarch conflicts. +# I don't want to pre-generate it but will instead wait for upstream +# to find a suitable solution that will always bring the same files, +# or that Doxygen is fixed not to do this. +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +110,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 24 2007 Linus Walleij 2.2.6-2 +- Flat out KILL the Doxygen HTML docs to resolve multiarch conflicts. + Either upstream (that's me!) needs to work around the HTML files being + different each time OR Doxygen must stop generating anchors that + hash the system time, creating different files with each generation. + Pre-generating the docs is deemed silly. (Someone will disagree.) * Wed Sep 5 2007 Linus Walleij 2.2.6-1 - Long overdue upstream release. - Shape up udev rules so they look like the libsane stuff.