diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dc53ce1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libmtp-1.1.14.tar.gz diff --git a/.libmtp.metadata b/.libmtp.metadata new file mode 100644 index 0000000..e82a86f --- /dev/null +++ b/.libmtp.metadata @@ -0,0 +1 @@ +22568b321e467cbc1fe222f8935107a53e57f3ab SOURCES/libmtp-1.1.14.tar.gz diff --git a/SOURCES/0001-doc-Don-t-document-internal-endian-macros.patch b/SOURCES/0001-doc-Don-t-document-internal-endian-macros.patch new file mode 100644 index 0000000..0e995c4 --- /dev/null +++ b/SOURCES/0001-doc-Don-t-document-internal-endian-macros.patch @@ -0,0 +1,26 @@ +From 35275512f83d246ddbddd2be2b970925e73df45e Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 9 Oct 2017 14:25:26 +0200 +Subject: [PATCH] doc: Don't document internal endian macros + +As those will change across platforms, and lead to multilib conflicts +--- + doc/Doxyfile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in +index 65c2b83..1bc3b16 100644 +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -452,7 +452,7 @@ EXCLUDE_SYMLINKS = NO + # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude + # certain files from those directories. + +-EXCLUDE_PATTERNS = ++EXCLUDE_PATTERNS = */src/gphoto2-endian.h + + # The EXAMPLE_PATH tag can be used to specify one or more files or + # directories that contain example code fragments that are included (see +-- +2.14.2 + diff --git a/SPECS/libmtp.spec b/SPECS/libmtp.spec new file mode 100644 index 0000000..4aa0b8e --- /dev/null +++ b/SPECS/libmtp.spec @@ -0,0 +1,382 @@ +# SPEC file for libmtp, primary target is the Fedora +# RPM repository. + +Name: libmtp +Version: 1.1.14 +Release: 1%{?dist} +Summary: A software library for MTP media players +URL: http://libmtp.sourceforge.net/ + +Group: System Environment/Libraries +Source0: https://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +License: LGPLv2+ +Requires: udev +BuildRequires: libusbx-devel +BuildRequires: doxygen +BuildRequires: libgcrypt-devel +BuildRequires: chrpath + +Patch0: 0001-doc-Don-t-document-internal-endian-macros.patch + +%description +This package provides a software library for communicating with MTP +(Media Transfer Protocol) media players, typically audio players, video +players etc. + +%package examples +Summary: Example programs for libmtp +Group: Applications/Multimedia +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description examples +This package provides example programs for communicating with MTP +devices. + +%package devel +Summary: Development files for libmtp +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig +Requires: libusb1-devel +Requires: libgcrypt-devel + +%description devel +This package provides development files for the libmtp +library for MTP media players. + +%prep +%setup -q +%patch0 -p1 + +%build +%configure --disable-static \ + --with-udev-rules=69-libmtp.rules +%make_build + +%install +%make_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 +# Copy documentation to a good place +mkdir -p -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +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%{_includedir}/*.h \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc \ + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-, root,root,-) +%{_libdir}/libmtp.so.9* +/usr/lib/udev/rules.d/* +/usr/lib/udev/hwdb.d/* +/usr/lib/udev/mtp-probe + +%files examples +%defattr(-,root,root,-) +%{_bindir}/* + +%files devel +%defattr(-,root,root,-) +%{_libdir}/libmtp.so +%dir %{_docdir}/%{name}-%{version} +%{_docdir}/%{name}-%{version}/* +%{_includedir}/*.h +%{_libdir}/pkgconfig/libmtp.pc + + +%changelog +* Mon Oct 09 2017 Bastien Nocera - 1.1.14-1 +- Update to 1.1.14 +Resolves: #1356288 + +* Mon Oct 09 2017 Bastien Nocera - 1.1.13-2 +- Fix multilib conflict with internal header +Resolves: #1356288 + +* Fri Oct 06 2017 Bastien Nocera - 1.1.13-1 +- Rebase to libmtp 1.1.13 +Resolves: #1356288 + +* Mon May 23 2016 Bastien Nocera - 1.1.6-5 +- Fix memory leak +Resolves: #1040011 + +* Wed May 18 2016 Bastien Nocera - 1.1.6-4 +- Fix kernel hang when using libmtp +Resolves: #1049969 + +* Fri Jan 24 2014 Daniel Mach - 1.1.6-3 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.1.6-2 +- Mass rebuild 2013-12-27 + +* Wed Oct 9 2013 Matthias Clasen - 1.1.6-1 +- Install udev rules in /usr/lib/udev +- Disable strict aliasing + +* Fri Mar 15 2013 Linus Walleij 1.1.6-0 +- New upstream version, several bug fixes, apropriate for GVFS etc. + +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Oct 17 2012 Linus Walleij 1.1.5-2 +- Explicit disable MTPZ for now. + +* Thu Sep 13 2012 Linus Walleij 1.1.5-1 +- New upstream version with several bug fixes. + +* Sat Aug 18 2012 Linus Walleij 1.1.4-1 +- New upstream version with several bug fixes. + +* Thu Jul 19 2012 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Apr 03 2012 Linus Walleij 1.1.3-2 +- Use libusb-1.0 for sure, come on. + +* Thu Apr 03 2012 Linus Walleij 1.1.3-1 +- Upstream update with several bug fixes including Fedora patch + +* Sat Jan 28 2012 Linus Walleij 1.1.2-2 +- Bugfix to avoid probing Canon scanners + +* Thu Jan 12 2012 Linus Walleij 1.1.2-1 +- Upstream update to use libusb-1.0 and other fixes. + +* Thu Nov 10 2011 Linus Walleij 1.1.1-2 +- Add an Obsoletes: libmtp-hal so that users can upgrade from F15 + +* Sat Oct 22 2011 Linus Walleij 1.1.1-1 +- New upstream version fixing problems with a few color devices + plus adding new device support. Move udev rules from level + 60 to level 69 to come after SANE and avoid probing these + devices. + +* Fri Jun 10 2011 Rex Dieter 1.1.0-2 +- %%files: track abi/soname, so bumps aren't a surprise + +* Tue Jun 08 2011 Linus Walleij 1.1.0-1 +- New upstream version including fixed bugs and the patch we + used to carry. Dependecies need to be rebuilt. (New + soversion) + +* Tue Jun 07 2011 Linus Walleij 1.0.6-3 +- Nuke HAL dependency. + +* Fri Apr 01 2011 Linus Walleij 1.0.6-2 +- Maybe fixing a probing issue on an input device. + +* Sat Feb 12 2011 Linus Walleij 1.0.6-1 +- New upstream release fixing bugs & more things we patched. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Feb 5 2011 Linus Walleij 1.0.5-1 +- New upstream release fixing all the things we patched. + +* Wed Jan 24 2011 Linus Walleij 1.0.4-3 +- Screwed up boolean logic in last patch, fixing it. + +* Wed Jan 19 2011 Linus Walleij 1.0.4-2 +- Testing out a patch to be more careful when probing devices. + +* Sun Jan 9 2011 Linus Walleij 1.0.4-1 +- New upstream version with mucho udev fixes. + +* Wed Dec 1 2010 Linus Walleij 1.0.3-7 +- Now even with correct commas and stuff in udev actions. + +* Tue Nov 30 2010 Linus Walleij 1.0.3-6 +- It appears adding ENV{ID_MTP_DEVICE}="1", + ENV{ID_MEDIA_PLAYER}="1" is the way forward so testing this + before pushing a new libmtp release. + +* Thu Jun 17 2010 Bastien Nocera 1.0.3-5 +- Split out hal sub-package + +* Thu Jun 10 2010 Linus Walleij 1.0.3-4 +- Set ENV{ACL_MANAGE}="0" and TAG+="udev-acl" akin to rfkill + apparently this may be an interrim solution. + +* Sat Jun 05 2010 Linus Walleij 1.0.3-3 +- Remove ENV{ACL_MANAGE} after Bastiens bug report. + +* Tue May 25 2010 Linus Walleij 1.0.3-2 +- Replace hal-filesystem dependence with hal-info + We can remove this altogether once all apps are cleansed + from HAL. + +* Sun May 23 2010 Linus Walleij 1.0.3-1 +- New upstream version, bug fixes. + +* Wed Feb 2 2010 Linus Walleij 1.0.2-1 +- New upstream version, lots of bug fixes. + +* Wed Jan 20 2010 Bastien Nocera 1.0.1-3 +- Require hal-filesystem, instead of HAL + +* Tue Dec 1 2009 Linus Walleij 1.0.1-2 +- Two patches from Dan Nicholson to fix up the udev rules a bit. + +* Sat Sep 12 2009 Linus Walleij 1.0.1-1 +- New upstream release. No interface changes! + +* 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 + +* Tue Mar 17 2009 Linus Walleij 0.3.7-1 +- New upstream bugfix release. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 22 2009 Linus Walleij 0.3.6-1 +- New upstream bugfix release. + +* Sun Dec 21 2008 Linus Walleij 0.3.5-1 +- New upstream bugfix release. +- Nuke documentation again. Multilib no like. + +* Fri Nov 7 2008 Linus Walleij 0.3.4-1 +- New upstream bugfix release. +- Bastiens patch is upstreamed, dropping that patch. + +* Sat Oct 25 2008 - Bastien Nocera - 0.3.3-4 +- Update device list from CVS and fix the build + +* Sat Oct 25 2008 - Bastien Nocera - 0.3.3-3 +- Add support for more Nokia phones from their WMP10 drivers + +* Fri Oct 24 2008 - Bastien Nocera - 0.3.3-2 +- Add support for the Nokia N82 + +* Fri Sep 26 2008 Linus Walleij 0.3.3-1 +- New upstream bugfix release. + +* Sat Sep 20 2008 Linus Walleij 0.3.2-1 +- New upstream version. (API and ABI compatible.) Fixes + bugs on Creative devices. + +* Tue Aug 26 2008 Linus Walleij 0.3.1-1 +- New upstream version. (API and ABI compatible.) + +* Thu Aug 7 2008 Linus Walleij 0.3.0-1 +- Upgrade to 0.3.0. This has to happen some way, perhaps the + painful way: I upgrade to gnomad2 2.9.2 that use 0.3.0 and + then I write patches to Rhythmbox and Amarok to use 0.3.0 + and also send these upstream. + +* Fri Jul 11 2008 Linus Walleij 0.2.6.1-3 +- Loose PAM console permissions, also assume that we can ship + documentation again since Doxygen has been updated. Fedora + HALd rules for the portable_audio_player capability in + 20-acl-management.fdi will change permissions on the device + node for each plugged-in device. + +* Fri May 23 2008 Adam Jackson 0.2.6.1-2 +- libmtp-0.2.6.1-simpler-rules.patch: Simplify udev rules for faster bootup. + +* Sat Mar 8 2008 Linus Walleij 0.2.6.1-1 +- New upstream bugfix release. + +* Sun Mar 2 2008 Linus Walleij 0.2.6-1 +- New upstream release. + +* Sat Feb 9 2008 Linus Walleij 0.2.5-2 +- Rebuild for GCC 4.3. + +* Wed Jan 9 2008 Linus Walleij 0.2.5-1 +- New upstream release. + +* Thu Nov 22 2007 Linus Walleij 0.2.4-1 +- New upstream release. + +* Thu Oct 25 2007 Linus Walleij 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 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 + different each time OR Doxygen must stop generating anchors that + hash the system time, creating different files with each generation. + Pre-generating the docs is deemed silly. (Someone will disagree.) + +* Fri Aug 17 2007 Linus Walleij 0.2.2-1 +- New upstream release. + +* Fri Aug 17 2007 Linus Walleij 0.2.1-2 +- License field update from LGPL to LGPLv2+ + +* Tue Aug 7 2007 Linus Walleij 0.2.1-1 +- Upstream bugfix release. + +* Sat Aug 4 2007 Linus Walleij 0.2.0-1 +- New upstream release. +- Fixes (hopefully) the issues found by Harald. +- Dependent apps will need to recompile and patch some minor code. + +* Mon Jul 30 2007 Harald Hoyer - 0.1.5-2 +- changed udev rules for new kernel and udev versions + +* Mon Mar 26 2007 Linus Walleij 0.1.5-1 +- New upstream release. +- Candidate for FC5, FC6 backport. +- Hopefully API/ABI compatible, testing in devel tree. + +* Wed Mar 7 2007 Linus Walleij 0.1.4-1 +- New upstream release. +- Candidate for FC5, FC6 backport. +- Hopefully API/ABI compatible, testing in devel tree. + +* Wed Jan 17 2007 Linus Walleij 0.1.3-1 +- New upstream release. +- Candidate for FC5, FC6 backport. + +* Thu Dec 7 2006 Linus Walleij 0.1.0-1 +- New upstream release. +- Start providing HAL rules. + +* Fri Oct 20 2006 Linus Walleij 0.0.21-1 +- New upstream release. + +* Tue Sep 26 2006 Linus Walleij 0.0.20-1 +- New upstream release. +- Updated after review by Parag AN, Kevin Fenzi and Ralf Corsepius. +- Fixed pkgconfig bug upstream after being detected by Ralf... + +* Sun Aug 27 2006 Linus Walleij 0.0.15-1 +- New upstream release. + +* Wed Aug 23 2006 Linus Walleij 0.0.13-1 +- First RPM'ed