From 46680215cb0bc521136114fe45526d47f3af18bc Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 4 Aug 2009 00:38:28 +0000 Subject: [PATCH] Update to libmtp 1.0.0, drop non-applicable patch. --- .cvsignore | 2 +- libmtp-0.2.6.1-simpler-rules.patch | 28 ---------------------------- libmtp.spec | 24 +++++++++++++++++++----- sources | 2 +- 4 files changed, 21 insertions(+), 35 deletions(-) delete mode 100644 libmtp-0.2.6.1-simpler-rules.patch diff --git a/.cvsignore b/.cvsignore index cd00dd9..3261b57 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmtp-0.3.7.tar.gz +libmtp-1.0.0.tar.gz diff --git a/libmtp-0.2.6.1-simpler-rules.patch b/libmtp-0.2.6.1-simpler-rules.patch deleted file mode 100644 index 0f7c033..0000000 --- a/libmtp-0.2.6.1-simpler-rules.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up libmtp-0.2.6.1/examples/hotplug.c.jx libmtp-0.2.6.1/examples/hotplug.c ---- libmtp-0.2.6.1/examples/hotplug.c.jx 2007-11-10 19:06:28.000000000 -0500 -+++ libmtp-0.2.6.1/examples/hotplug.c 2008-05-23 11:06:12.000000000 -0400 -@@ -93,7 +93,7 @@ int main (int argc, char **argv) - printf("ATTR{dev}!=\"?*\", GOTO=\"libmtp_rules_end\"\n"); - printf("SUBSYSTEM==\"usb\", GOTO=\"libmtp_usb_rules\"\n" - "# The following thing will be deprecated when older kernels are phased out.\n" -- "SUBSYSTEM==\"usb_device\", GOTO=\"libmtp_usb_device_rules\"\n" -+ "SUBSYSTEM==\"usb_device\", GOTO=\"libmtp_usb_rules\"\n" - "GOTO=\"libmtp_rules_end\"\n\n" - "LABEL=\"libmtp_usb_rules\"\n\n"); - break; -@@ -182,6 +182,7 @@ int main (int argc, char **argv) - // For backward comparibility with the #$!+@! ever changing - // udev rule style... - if (style == style_udev) { -+#if 0 - printf("GOTO=\"libmtp_rules_end\"\n\n"); - printf("LABEL=\"libmtp_usb_device_rules\"\n"); - for (i = 0; i < numentries; i++) { -@@ -190,6 +191,7 @@ int main (int argc, char **argv) - printf("# %s %s\n", entry->vendor, entry->product); - printf("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", %s\n", entry->vendor_id, entry->product_id, action); - } -+#endif - printf("GOTO=\"libmtp_rules_end\"\n\n"); - } - diff --git a/libmtp.spec b/libmtp.spec index c1435e6..d20fbbe 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -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 1.0.0-1 +- New upstream release. Dependent packages need to be rebuilt against this. + * Fri Jul 24 2009 Fedora Release Engineering - 0.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index faf6151..7c2252d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -897c3a84a8bdd78f003820ed5f7fa6cf libmtp-0.3.7.tar.gz +f105c534dd4f9b6cfdc0ebfb5681266d libmtp-1.0.0.tar.gz