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

[Linus Walleij (snirkel)]

Author: snirkel

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

Modified Files:
	libmtp.spec 
Log Message:
Missed one generated file and move around a bit. This is 
not vital so not pushing any new tag/build.



Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libmtp.spec	24 Oct 2007 09:13:05 -0000	1.12
+++ libmtp.spec	24 Oct 2007 09:29:47 -0000	1.13
@@ -56,17 +56,6 @@
 %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.
@@ -80,6 +69,18 @@
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \
 $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 \
+      $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+# 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