rpms/libmtp/devel .cvsignore, 1.23, 1.24 libmtp.spec, 1.34, 1.35 sources, 1.23, 1.24 libmtp-0.2.6.1-simpler-rules.patch, 1.1, NONE

[Linus Walleij]

Author: snirkel

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

Modified Files:
	.cvsignore libmtp.spec sources 
Removed Files:
	libmtp-0.2.6.1-simpler-rules.patch 
Log Message:
Update to libmtp 1.0.0, drop non-applicable patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	16 Mar 2009 23:57:22 -0000	1.23
+++ .cvsignore	4 Aug 2009 00:38:28 -0000	1.24
@@ -1 +1 @@
-libmtp-0.3.7.tar.gz
+libmtp-1.0.0.tar.gz


Index: libmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- libmtp.spec	25 Jul 2009 06:09:29 -0000	1.34
+++ libmtp.spec	4 Aug 2009 00:38:28 -0000	1.35
@@ -2,8 +2,8 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        0.3.7
-Release:        2%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -16,8 +16,6 @@ Requires:	hal
 BuildRequires:  libusb-devel
 BuildRequires:  doxygen
 
-Patch0: libmtp-0.2.6.1-simpler-rules.patch
-
 %description
 This package provides a software library for communicating with MTP
 (Media Transfer Protocol) media players, typically audio players, video
@@ -45,7 +43,6 @@ library for MTP media players.
 
 %prep
 %setup -q
-%patch0 -p1 -b .rules
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -59,6 +56,19 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Remove libtool archive remnant
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmtp.la
+# Replace links with relative links
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-delfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-getfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-newfolder
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-sendfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-sendtr
+pushd $RPM_BUILD_ROOT%{_bindir}
+ln -sf mtp-connect mtp-delfile
+ln -sf mtp-connect mtp-getfile
+ln -sf mtp-connect mtp-newfolder
+ln -sf mtp-connect mtp-sendfile
+ln -sf mtp-connect mtp-sendtr
+popd
 # Install udev rules file.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules
@@ -92,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+
 %files examples
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -106,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 4 2009 Linus Walleij <triad at df.lth.se> 1.0.0-1
+- New upstream release. Dependent packages need to be rebuilt against this.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmtp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	16 Mar 2009 23:57:23 -0000	1.23
+++ sources	4 Aug 2009 00:38:28 -0000	1.24
@@ -1 +1 @@
-897c3a84a8bdd78f003820ed5f7fa6cf  libmtp-0.3.7.tar.gz
+f105c534dd4f9b6cfdc0ebfb5681266d  libmtp-1.0.0.tar.gz


--- libmtp-0.2.6.1-simpler-rules.patch DELETED ---