rpms/libmtp/devel libmtp.spec,1.11,1.12

[Linus Walleij (snirkel)]

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26552

Modified Files:
	libmtp.spec 
Log Message:
Resolve multiarch problem with Doxygen doc



Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libmtp.spec	4 Oct 2007 22:32:52 -0000	1.11
+++ libmtp.spec	24 Oct 2007 09:13:05 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           libmtp
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -56,6 +56,17 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+# 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
 # Remove libtool archive remnant
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmtp.la
 # Install udev rules file.
@@ -96,6 +107,13 @@
 
 
 %changelog
+* Wed Oct 24 2007 Linus Walleij <triad at df.lth.se> 0.2.2-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.)
+
 * Fri Aug 17 2007 Linus Walleij <triad at df.lth.se> 0.2.2-1
 - New upstream release.