Compare commits

...

No commits in common. "c8s" and "c10s" have entirely different histories.
c8s ... c10s

4 changed files with 95 additions and 19 deletions

5
.gitignore vendored
View File

@ -1,2 +1,3 @@
SOURCES/libmtp-1.1.14.tar.gz /libmtp-*.tar.gz
/libmtp-1.1.14.tar.gz /*.log
/*.rpm

View File

@ -1,6 +1,6 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-8 - rhel-10
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -2,17 +2,25 @@
# RPM repository. # RPM repository.
Name: libmtp Name: libmtp
Version: 1.1.14 Version: 1.1.19
Release: 3%{?dist} Release: 9%{?dist}
Summary: A software library for MTP media players Summary: Software library for MTP media players
URL: http://libmtp.sourceforge.net/ URL: http://libmtp.sourceforge.net/
Source0: https://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source0: https://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
License: LGPLv2+ # m4/stdint.m4 is LicenseRef-Fedora-UltraPermissive
Requires: udev # m4/iconv.m4 is FSFULLR
BuildRequires: libusbx-devel License: LGPL-2.1-or-later AND LGPL-2.1-only AND FSFULLR AND LicenseRef-Fedora-UltraPermissive
Recommends: udev
BuildRequires: libtool
BuildRequires: gettext-devel
BuildRequires: gcc
BuildRequires: make
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: doxygen BuildRequires: doxygen
%if ! 0%{?rhel}
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
%endif
BuildRequires: chrpath BuildRequires: chrpath
Patch0: 0001-doc-Don-t-document-internal-endian-macros.patch Patch0: 0001-doc-Don-t-document-internal-endian-macros.patch
@ -33,9 +41,6 @@ devices.
%package devel %package devel
Summary: Development files for libmtp Summary: Development files for libmtp
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
Requires: libusb1-devel
Requires: libgcrypt-devel
%description devel %description devel
This package provides development files for the libmtp This package provides development files for the libmtp
@ -46,8 +51,13 @@ library for MTP media players.
%patch0 -p1 %patch0 -p1
%build %build
yes "" | ./autogen.sh
%configure --disable-static \ %configure --disable-static \
--with-udev-rules=69-libmtp.rules --with-udev-rules=69-libmtp.rules \
%if 0%{?rhel}
--disable-mtpz \
%endif
%{nil}
%make_build %make_build
%install %install
@ -72,11 +82,11 @@ iconv -f iso-8859-1 -t utf-8 -o COPYING.utf8 COPYING
touch -r COPYING COPYING.utf8; mv -f COPYING.utf8 COPYING touch -r COPYING COPYING.utf8; mv -f COPYING.utf8 COPYING
# Copy documentation to a good place # Copy documentation to a good place
mkdir -p -m 755 $RPM_BUILD_ROOT%{_pkgdocdir} mkdir -p -m 755 $RPM_BUILD_ROOT%{_pkgdocdir}
install -p -m 644 AUTHORS ChangeLog README TODO \ install -p -m 644 AUTHORS README TODO \
$RPM_BUILD_ROOT%{_pkgdocdir} $RPM_BUILD_ROOT%{_pkgdocdir}
# Move some autogenerated documentation where we want it # Move some autogenerated documentation where we want it
if [ $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html != $RPM_BUILD_ROOT%{_pkgdocdir}/html ] ; then \ if [ $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html != $RPM_BUILD_ROOT%{_pkgdocdir}/html ] ; then \
mv $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html \ mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html \
$RPM_BUILD_ROOT%{_pkgdocdir} ; \ $RPM_BUILD_ROOT%{_pkgdocdir} ; \
fi fi
# Touch generated files to make them always have the same time stamp. # Touch generated files to make them always have the same time stamp.
@ -96,17 +106,82 @@ chrpath --delete $RPM_BUILD_ROOT{%{_bindir},/usr/lib/udev}/mtp*
/usr/lib/udev/mtp-probe /usr/lib/udev/mtp-probe
%files examples %files examples
%defattr(-,root,root,-)
%{_bindir}/mtp-* %{_bindir}/mtp-*
%files devel %files devel
%defattr(-,root,root,-)
%{_libdir}/libmtp.so %{_libdir}/libmtp.so
%{_pkgdocdir} %{_pkgdocdir}
%{_includedir}/libmtp.h %{_includedir}/libmtp.h
%{_libdir}/pkgconfig/libmtp.pc %{_libdir}/pkgconfig/libmtp.pc
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.1.19-9
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.19-8
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Feb 21 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.1.19-4
- Fix flatpak build
- Soften udev dependency for flatpaks
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Mar 2 2022 Linus Walleij <triad@df.lth.se> - 1.1.19-1
- Upgrade to 1.1.19
- No 'configure' script in the package so calling autogen.sh as part of the build
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed May 26 2021 Ondrej Holy <oholy@redhat.com> - 1.1.18-3
- Drop redundant devel requires
- Disable MTPZ support in RHEL
- Use pkgconfig for libusb
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 05 2021 Robert Scheck <robert@fedoraproject.org> - 1.1.18-1
- Upgrade to 1.1.18
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.16-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.16-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Nov 16 2018 Linus Walleij <linus.ml.walleij@gmail.com> - 1.1.16
+ libmtp-1.1.16-1
- New upstream release 1.1.16.
- Suddenly reappear doing package maintenance duties.
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.14-3 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libmtp-1.1.14.tar.gz) = 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1 SHA512 (libmtp-1.1.19.tar.gz) = 8d9ecaad5be3699426dc4911cff4f3ff23bbf41cf3289e1b8b2d7ab4cf8dfc911f9f788dec92dff98904b825098455a3ac2649d3742b2409950b688d8b2cb629