rpms/libmtp/F-8 libmtp.spec,1.12,1.13

[Linus Walleij (snirkel)]

Author: snirkel

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

Modified Files:
	libmtp.spec 
Log Message:



Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/F-8/libmtp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libmtp.spec	24 Oct 2007 09:15:12 -0000	1.12
+++ libmtp.spec	30 Oct 2007 23:58:34 -0000	1.13
@@ -2,8 +2,8 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.2.2
-Release:        2%{?dist}
+Version:        0.2.3
+Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -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
@@ -107,6 +108,13 @@
 
 
 %changelog
+* Thu Oct 25 2007 Linus Walleij <triad at df.lth.se> 0.2.3-1
+- New upstream release.
+- New soname libmtp.so.7 so all apps using libmtp have to
+  be recompiled, have fun.
+- If it works out we'll try to reserve a spot to backport
+  this fixed version to F8 and F7 in a controlled manner.
+
 * 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