diff --git a/0001-doc-Don-t-document-internal-endian-macros.patch b/0001-doc-Don-t-document-internal-endian-macros.patch index 0e995c4b58da9b573ed69244c6047ce81dd2aa45..a1cf68abb0403c77a82bf93ea81fc4e1fe8dc3ec 100644 --- a/0001-doc-Don-t-document-internal-endian-macros.patch +++ b/0001-doc-Don-t-document-internal-endian-macros.patch @@ -12,15 +12,15 @@ 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. +@@ -1007,7 +1007,7 @@ + # Note that the wildcards are matched against the file with absolute path, so to + # exclude all test directories for example use the pattern */test/* --EXCLUDE_PATTERNS = +-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 + # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names + # (namespaces, classes, functions, etc.) that should be excluded from the -- 2.14.2 diff --git a/libmtp-1.1.19.tar.gz b/libmtp-1.1.19.tar.gz deleted file mode 100644 index e2c6f0009e5877c4cc815b9c05a87f7d10424c57..0000000000000000000000000000000000000000 Binary files a/libmtp-1.1.19.tar.gz and /dev/null differ diff --git a/libmtp-1.1.21.tar.gz b/libmtp-1.1.21.tar.gz deleted file mode 100644 index fb180171c4f5befb1b9eaba228e7dffe2a399055..0000000000000000000000000000000000000000 Binary files a/libmtp-1.1.21.tar.gz and /dev/null differ diff --git a/libmtp-1.1.22-udev-dir.patch b/libmtp-1.1.22-udev-dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..c9ebdc12c0c0e02a5b956d0acf3681cc546f9621 --- /dev/null +++ b/libmtp-1.1.22-udev-dir.patch @@ -0,0 +1,22 @@ +--- libmtp-1.1.22/configure.ac.orig 2024-11-21 13:40:06.141593556 +0800 ++++ libmtp-1.1.22/configure.ac 2024-11-21 13:40:46.790162108 +0800 +@@ -39,8 +39,8 @@ + hwdbdir=$(TARGET_UDEV)/hwdb.d + endif + else +- udevrulesdir=$(libdir)/udev/rules.d +- hwdbdir=$(libdir)/udev/hwdb.d ++ udevrulesdir=$(UDEV)/rules.d ++ hwdbdir=$(UDEV)/hwdb.d + endif + ' + AC_SUBST([UDEVdata_SNIPPET]) +@@ -52,7 +52,7 @@ + mtp_probedir=$(TARGET_UDEV) + endif + else +- mtp_probedir=$(libdir)/udev ++ mtp_probedir=$(UDEV) + endif + ' + AC_SUBST([UDEVbin_SNIPPET]) diff --git a/libmtp-1.1.22.tar.gz b/libmtp-1.1.22.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d78648b9e8b69156ae2e74275e30fc4bd6de76da Binary files /dev/null and b/libmtp-1.1.22.tar.gz differ diff --git a/libmtp.spec b/libmtp.spec index 7045580dcfd0ca3a321472f91251ba776372546a..4ee28d54649acae01547020aaed56cfa106205f0 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -1,13 +1,15 @@ Name: libmtp -Version: 1.1.21 +Version: 1.1.22 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/ +License: LGPL-2.1-or-later +URL: https://libmtp.sourceforge.net/ Source0: https://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: 0001-doc-Don-t-document-internal-endian-macros.patch +Patch1: libmtp-1.1.22-udev-dir.patch -BuildRequires: libusbx-devel doxygen libgcrypt-devel chrpath gcc gettext-devel libtool +BuildRequires: autoconf automake libtool +BuildRequires: libusbx-devel doxygen libgcrypt-devel gcc gettext-devel Requires: udev Provides: %{name}-examples%{?_isa} %{name}-examples Obsoletes: %{name}-examples @@ -29,12 +31,13 @@ This package includes development files for libmtp. %autosetup -n libmtp-%{version} -p1 %build -%configure --disable-static --with-udev-rules=69-libmtp.rules +autoreconf -fi +%configure --disable-static --with-udev-rules=69-libmtp.rules --with-udev=%{_prefix}/lib/udev %make_build %install %make_install -rm -f $RPM_BUILD_ROOT%{_libdir}/libmtp.la +%delete_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 @@ -59,16 +62,13 @@ 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 %license COPYING %{_libdir}/%{name}.so.9* -/usr/lib/udev/rules.d/69-%{name}.rules -/usr/lib/udev/hwdb.d/69-%{name}.hwdb -/usr/lib/udev/mtp-probe +%{_udevrulesdir}/69-%{name}.rules +%{_udevhwdbdir}/69-%{name}.hwdb +%{_prefix}/lib/udev/mtp-probe %{_bindir}/mtp-* %files devel @@ -78,6 +78,9 @@ chrpath --delete $RPM_BUILD_ROOT{%{_bindir},/usr/lib/udev}/mtp* %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Nov 21 2024 Funda Wang - 1.1.22-1 +- Upgrade to 1.1.22 + * Fri Apr 28 2023 wangkai <13474090681@163.com> - 1.1.21-1 - Upgrade to 1.1.21