diff --git a/libmtp.spec b/libmtp.spec index 3aceb50..ecfaabf 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -56,17 +56,6 @@ examples/hotplug -a"SYMLINK+=\"libmtp-%k\"" > libmtp.rules %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 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perm # 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