rpms/libnjb/F-8 libnjb.spec,1.10,1.11

[Linus Walleij (snirkel)]

Author: snirkel

Update of /cvs/extras/rpms/libnjb/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30170

Modified Files:
	libnjb.spec 
Log Message:
Fix multiarch issue with Doxygen generated documentation.



Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-8/libnjb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libnjb.spec	5 Sep 2007 21:53:04 -0000	1.10
+++ libnjb.spec	24 Oct 2007 09:38:30 -0000	1.11
@@ -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 @@
 # 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 @@
 
 
 %changelog
+* Wed Oct 24 2007 Linus Walleij <triad at df.lth.se> 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 <triad at df.lth.se> 2.2.6-1
 - Long overdue upstream release.
 - Shape up udev rules so they look like the libsane stuff.