rpms/libmtp/devel .cvsignore, 1.20, 1.21 libmtp.spec, 1.29, 1.30 sources, 1.20, 1.21

[Linus Walleij]

Author: snirkel

Update of /cvs/extras/rpms/libmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6325

Modified Files:
	.cvsignore libmtp.spec sources 
Log Message:
Upstream release and fix multilib conflict.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	7 Nov 2008 22:51:04 -0000	1.20
+++ .cvsignore	21 Dec 2008 13:26:59 -0000	1.21
@@ -1 +1 @@
-libmtp-0.3.4.tar.gz
+libmtp-0.3.5.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libmtp.spec	7 Nov 2008 22:51:04 -0000	1.29
+++ libmtp.spec	21 Dec 2008 13:26:59 -0000	1.30
@@ -2,7 +2,7 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.3.4
+Version:        0.3.5
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
@@ -73,6 +73,13 @@
       $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
@@ -99,6 +106,10 @@
 
 
 %changelog
+* Sun Dec 21 2008 Linus Walleij <triad at df.lth.se> 0.3.5-1
+- New upstream bugfix release.
+- Nuke documentation again. Multilib no like.
+
 * Fri Nov 7 2008 Linus Walleij <triad at df.lth.se> 0.3.4-1
 - New upstream bugfix release.
 - Bastiens patch is upstreamed, dropping that patch.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Nov 2008 22:51:04 -0000	1.20
+++ sources	21 Dec 2008 13:27:00 -0000	1.21
@@ -1 +1 @@
-966a542542e9aec301cf0781e821dbd9  libmtp-0.3.4.tar.gz
+f0f81936f26908456e2a21f61ae32dbb  libmtp-0.3.5.tar.gz