Compare commits

...

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

4 changed files with 15 additions and 60 deletions

5
.gitignore vendored
View File

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

View File

@ -1,6 +1,6 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-9 - rhel-8
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,21 +2,17 @@
# RPM repository. # RPM repository.
Name: libmtp Name: libmtp
Version: 1.1.18 Version: 1.1.14
Release: 6%{?dist} Release: 3%{?dist}
Summary: Software library for MTP media players Summary: A 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+ License: LGPLv2+
Requires: udev Requires: udev
BuildRequires: gcc BuildRequires: libusbx-devel
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
@ -37,6 +33,9 @@ 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
@ -48,11 +47,7 @@ library for MTP media players.
%build %build
%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
@ -77,7 +72,7 @@ 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 README TODO \ install -p -m 644 AUTHORS ChangeLog 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/usr/share/doc/%{name}-%{version}/html != $RPM_BUILD_ROOT%{_pkgdocdir}/html ] ; then \
@ -101,56 +96,17 @@ 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
* Fri Jan 21 2022 Ondrej Holy <oholy@redhat.com> - 1.1.18-6
- Ship libmtp-devel in CRB (#2026310)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.18-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed May 26 2021 Ondrej Holy <oholy@redhat.com> - 1.1.18-4
- Drop redundant devel requires
- Disable MTPZ support in RHEL
- Use pkgconfig for libusb
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.18-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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.18.tar.gz) = 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8 SHA512 (libmtp-1.1.14.tar.gz) = 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1