diff --git a/backport-libmtp-fix-multiple-definition.patch b/backport-libmtp-fix-multiple-definition.patch deleted file mode 100644 index b96df36..0000000 --- a/backport-libmtp-fix-multiple-definition.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/libmtp.c 2017-06-10 22:35:54.000000000 +0800 -+++ b/src/libmtp.c 2021-08-04 19:17:57.464456535 +0800 -@@ -44,6 +44,7 @@ - #include "util.h" - - #include "mtpz.h" -+int use_mtpz; - - #include - #include ---- a/src/mtpz.h 2014-08-25 02:41:04.000000000 +0800 -+++ b/src/mtpz.h 2021-08-04 19:17:03.819790448 +0800 -@@ -45,7 +45,7 @@ - - #endif - --int use_mtpz; -+extern int use_mtpz; - - #endif /* LIBMTP_H_INCLUSION_GUARD */ - diff --git a/libmtp-1.1.14.tar.gz b/libmtp-1.1.14.tar.gz deleted file mode 100644 index c16bb86..0000000 Binary files a/libmtp-1.1.14.tar.gz and /dev/null differ diff --git a/libmtp-1.1.19.tar.gz b/libmtp-1.1.19.tar.gz new file mode 100644 index 0000000..e2c6f00 Binary files /dev/null and b/libmtp-1.1.19.tar.gz differ diff --git a/libmtp.spec b/libmtp.spec index dccb5af..f234e56 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -1,14 +1,13 @@ Name: libmtp -Version: 1.1.14 -Release: 7 +Version: 1.1.19 +Release: 1 Summary: An Initiator implementation of the Media Transfer Protocol (MTP) in the form of a library License: LGPLv2+ URL: http://libmtp.sourceforge.net/ Source0: https://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: 0001-doc-Don-t-document-internal-endian-macros.patch -Patch1: backport-libmtp-fix-multiple-definition.patch -BuildRequires: libusbx-devel, doxygen, libgcrypt-devel, chrpath, gcc +BuildRequires: libusbx-devel doxygen libgcrypt-devel chrpath gcc gettext-devel libtool Requires: udev Provides: %{name}-examples%{?_isa} %{name}-examples Obsoletes: %{name}-examples @@ -30,29 +29,42 @@ This package includes development files for libmtp. %autosetup -n libmtp-%{version} -p1 %build +yes "" | ./autogen.sh %configure --disable-static --with-udev-rules=69-libmtp.rules %make_build %install %make_install -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la -cd $RPM_BUILD_ROOT%{_bindir} +rm -f $RPM_BUILD_ROOT%{_libdir}/libmtp.la +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 -cd - +popd iconv -f iso-8859-1 -t utf-8 -o COPYING.utf8 COPYING touch -r COPYING COPYING.utf8; mv -f COPYING.utf8 COPYING -touch -r configure.ac $RPM_BUILD_ROOT%{_includedir}/*.h $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc -mv $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html html -chrpath -d $RPM_BUILD_ROOT{%{_bindir},/usr/lib/udev}/mtp* +mkdir -p -m 755 $RPM_BUILD_ROOT%{_pkgdocdir} +install -p -m 644 AUTHORS README TODO \ + $RPM_BUILD_ROOT%{_pkgdocdir} +if [ $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html != $RPM_BUILD_ROOT%{_pkgdocdir}/html ] ; then \ + mv $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html \ + $RPM_BUILD_ROOT%{_pkgdocdir} ; \ +fi +touch -r configure.ac \ + $RPM_BUILD_ROOT%{_includedir}/*.h \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc +chrpath --delete $RPM_BUILD_ROOT{%{_bindir},/usr/lib/udev}/mtp* %ldconfig_scriptlets %files -%doc AUTHORS html README %license COPYING %{_libdir}/%{name}.so.9* /usr/lib/udev/rules.d/69-%{name}.rules @@ -62,10 +74,14 @@ chrpath -d $RPM_BUILD_ROOT{%{_bindir},/usr/lib/udev}/mtp* %files devel %{_libdir}/%{name}.so +%{_pkgdocdir} %{_includedir}/%{name}.h %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Mar 28 2022 lin zhang - 1.1.19-1 +- Upgrade to 1.1.19 + * Web Aug 04 2021 Liu Yinsi - 1.1.14-7 - define use_mtpz only in one .c file