From f19d401d7694d9c6226bb4cc6d2ebe1f1dafead9 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 2 Oct 2020 15:41:51 -0600 Subject: [PATCH 01/27] Add -fPIC to compilation flags --- android-file-transfer.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 91e334d..0a438b3 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 3.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -38,6 +38,9 @@ Features: %build +# QT requires the main progrma not to perform local symbol binding, +# -fPIC accomplishes that +export CXXFLAGS="-fPIC $RPM_OPT_FLAGS" %cmake -GNinja %cmake_build @@ -65,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Fri Oct 2 2020 Jeff Law - 3.9-7 +- Add -fPIC to compilation flags + * Fri Jul 31 2020 Fedora Release Engineering - 3.9-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ed145aa114fd94cb6e35ee38e294613dd573e0bf Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 2 Oct 2020 15:41:51 -0600 Subject: [PATCH 02/27] Add -fPIC to compilation flags --- android-file-transfer.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 91e334d..0a438b3 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 3.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -38,6 +38,9 @@ Features: %build +# QT requires the main progrma not to perform local symbol binding, +# -fPIC accomplishes that +export CXXFLAGS="-fPIC $RPM_OPT_FLAGS" %cmake -GNinja %cmake_build @@ -65,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Fri Oct 2 2020 Jeff Law - 3.9-7 +- Add -fPIC to compilation flags + * Fri Jul 31 2020 Fedora Release Engineering - 3.9-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a215ddda96d2528232661ec7864502931e7713a4 Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Mon, 30 Nov 2020 16:05:46 +0100 Subject: [PATCH 03/27] New upstream release 4.0 --- .gitignore | 1 + android-file-transfer.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 340d480..438e0ff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /android-file-transfer-linux-3.7.tar.gz /android-file-transfer-linux-3.8.tar.gz /android-file-transfer-linux-3.9.tar.gz +/android-file-transfer-linux-4.0.tar.gz diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 0a438b3..3f3e9ad 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -2,8 +2,8 @@ %undefine __cmake_in_source_build Name: android-file-transfer -Version: 3.9 -Release: 7%{?dist} +Version: 4.0 +Release: 1%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -15,8 +15,10 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build BuildRequires: pkgconfig(Qt5) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(pybind11) BuildRequires: pkgconfig(fuse) -BuildRequires: readline-devel +BuildRequires: pkgconfig(readline) BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -38,7 +40,7 @@ Features: %build -# QT requires the main progrma not to perform local symbol binding, +# QT requires the main program not to perform local symbol binding, # -fPIC accomplishes that export CXXFLAGS="-fPIC $RPM_OPT_FLAGS" %cmake -GNinja @@ -68,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Mon Nov 30 2020 Marek Blaha - 4.0-1 +- New upstream release 4.0 + * Fri Oct 2 2020 Jeff Law - 3.9-7 - Add -fPIC to compilation flags diff --git a/sources b/sources index e9646dd..6156133 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (android-file-transfer-linux-3.9.tar.gz) = 7468ff19d2b4ae0f768eea70ec45246da11c4e541d07a9548d057c080adbbc905f76dcdff18c4c8478cd19aee6992d02beaf8b4275d7302997652e25351ab5c8 +SHA512 (android-file-transfer-linux-4.0.tar.gz) = 31083d3f7adb06ba0b5e79738825f5a10f3f4ce7e5b24498f7255224c11a9d978b814749c4b5fd60a5ec2b4c7d06bc85ad4b0cfb6cbcf6b3ff3f7e331c6c03f1 From d5745bdf3f5c616fa0749fafb6eacb3c0caeca0e Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Sun, 15 Nov 2020 18:07:52 +0800 Subject: [PATCH 04/27] disable LTO #1894585 --- android-file-transfer.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 0a438b3..0ec0dfa 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -1,9 +1,15 @@ # Force out of source build %undefine __cmake_in_source_build +# Build with lto enabled will lead to crash +# see +# https://bugzilla.redhat.com/show_bug.cgi?id=1894585 +# Disabling lto until upstream fixes this problem +%define _lto_cflags %{nil} + Name: android-file-transfer Version: 3.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -68,6 +74,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Sun Nov 15 18:00:15 CST 2020 Qiyu Yan - 3.9-8 +- disable LTO #1894585 + * Fri Oct 2 2020 Jeff Law - 3.9-7 - Add -fPIC to compilation flags From b99c65cf1a04cc0e5749d2aaa507281c705de9aa Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Wed, 16 Dec 2020 10:15:24 +0100 Subject: [PATCH 05/27] New upstream release 4.1 --- .gitignore | 1 + android-file-transfer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 438e0ff..65dc52f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /android-file-transfer-linux-3.8.tar.gz /android-file-transfer-linux-3.9.tar.gz /android-file-transfer-linux-4.0.tar.gz +/android-file-transfer-linux-4.1.tar.gz diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 3f3e9ad..7ec8a4f 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -2,7 +2,7 @@ %undefine __cmake_in_source_build Name: android-file-transfer -Version: 4.0 +Version: 4.1 Release: 1%{?dist} Summary: Reliable Android MTP client with minimalist UI @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Dec 16 2020 Marek Blaha - 4.1-1 +- New upstream release 4.1 + * Mon Nov 30 2020 Marek Blaha - 4.0-1 - New upstream release 4.0 diff --git a/sources b/sources index 6156133..0884c89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (android-file-transfer-linux-4.0.tar.gz) = 31083d3f7adb06ba0b5e79738825f5a10f3f4ce7e5b24498f7255224c11a9d978b814749c4b5fd60a5ec2b4c7d06bc85ad4b0cfb6cbcf6b3ff3f7e331c6c03f1 +SHA512 (android-file-transfer-linux-4.1.tar.gz) = 76151089dcce304fb688a54a4f94ea605fa3d048765119c631a2ff2c8d107678062ed4d485a983dfb0b337c9b4d3639e3f76640b6bcc73e3e6449764e99298ab From 81e36d552012936a191ccad4586c2a4e66a96cce Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Tue, 5 Jan 2021 13:56:54 +0100 Subject: [PATCH 06/27] New upstream release 4.2 --- .gitignore | 1 + android-file-transfer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 65dc52f..3b3bd47 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /android-file-transfer-linux-3.9.tar.gz /android-file-transfer-linux-4.0.tar.gz /android-file-transfer-linux-4.1.tar.gz +/android-file-transfer-linux-4.2.tar.gz diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 7ec8a4f..e83ee13 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -2,7 +2,7 @@ %undefine __cmake_in_source_build Name: android-file-transfer -Version: 4.1 +Version: 4.2 Release: 1%{?dist} Summary: Reliable Android MTP client with minimalist UI @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Tue Jan 5 2020 Marek Blaha - 4.2-1 +- New upstream release 4.2 + * Wed Dec 16 2020 Marek Blaha - 4.1-1 - New upstream release 4.1 diff --git a/sources b/sources index 0884c89..6573eea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (android-file-transfer-linux-4.1.tar.gz) = 76151089dcce304fb688a54a4f94ea605fa3d048765119c631a2ff2c8d107678062ed4d485a983dfb0b337c9b4d3639e3f76640b6bcc73e3e6449764e99298ab +SHA512 (android-file-transfer-linux-4.2.tar.gz) = 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 From 918b8ce60cc870c5d712ab1cf77878ea30c4703e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:05:46 +0000 Subject: [PATCH 07/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index e83ee13..eabfee6 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 5 2020 Marek Blaha - 4.2-1 - New upstream release 4.2 From ec0d13e7e3cf345ed770ceaf004e6a678c28b8ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:37:55 +0000 Subject: [PATCH 08/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From fcbb52ff3fa0c95372b48b52289f02ea56f3e0e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:33:32 +0000 Subject: [PATCH 09/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index eabfee6..73e58b2 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 916bef47872e1dffa65147941bc366f42a8084dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:15:09 +0000 Subject: [PATCH 10/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 73e58b2..daed4b2 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8236ec7279d9da0a1afb7b278532e5ed26cb82b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:47:10 +0000 Subject: [PATCH 11/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index daed4b2..c852eaf 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 07181690bfb42229c67b55f732901405b5468e98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:43:32 +0000 Subject: [PATCH 12/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index c852eaf..daf0697 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPLv2+ @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 12c69a81adfe01f75442b823e4df23589f1b1dae Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Thu, 30 Mar 2023 09:48:07 +0200 Subject: [PATCH 13/27] Migrate to SPDX license --- android-file-transfer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index daf0697..32c0045 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,10 +3,10 @@ Name: android-file-transfer Version: 4.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Reliable Android MTP client with minimalist UI -License: LGPLv2+ +License: LGPL-2.1-only URL: https://github.com/whoozle/android-file-transfer-linux Source0: %{url}/archive/v%{version}/%{name}-linux-%{version}.tar.gz @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Thu Mar 30 2023 Marek Blaha - 4.2-7 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 4.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2fbcb005ef5806de18db2bd21c99f1cd5967a038 Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Tue, 2 May 2023 09:12:22 +0200 Subject: [PATCH 14/27] Backport fix to build with GCC 13 Resolves: rhbz#2171435 --- 0001-Fix-build-with-GCC-13-330.patch | 30 ++++++++++++++++++++++++++++ android-file-transfer.spec | 7 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-build-with-GCC-13-330.patch diff --git a/0001-Fix-build-with-GCC-13-330.patch b/0001-Fix-build-with-GCC-13-330.patch new file mode 100644 index 0000000..6d55607 --- /dev/null +++ b/0001-Fix-build-with-GCC-13-330.patch @@ -0,0 +1,30 @@ +From e8f45ff6f02d2e1e09c12f3aa708e87548d4f2bd Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 18 Apr 2023 11:38:22 +0100 +Subject: [PATCH] Fix build with GCC 13 (#330) + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some +are no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/894788 +--- + mtp/types.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mtp/types.h b/mtp/types.h +index 32024e4..676e180 100644 +--- a/mtp/types.h ++++ b/mtp/types.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + namespace mtp +-- +2.40.0 + diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 32c0045..4b86aa4 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,13 +3,15 @@ Name: android-file-transfer Version: 4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only URL: https://github.com/whoozle/android-file-transfer-linux Source0: %{url}/archive/v%{version}/%{name}-linux-%{version}.tar.gz +Patch0001: 0001-Fix-build-with-GCC-13-330.patch + Requires: hicolor-icon-theme BuildRequires: cmake BuildRequires: gcc-c++ @@ -70,6 +72,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Tue May 2 2023 Marek Blaha - 4.2-8 +- Backport fix to build with GCC 13 + * Thu Mar 30 2023 Marek Blaha - 4.2-7 - migrated to SPDX license From d958f2315f7db02b2484819c6b3a1c1f8922642e Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Wed, 3 May 2023 15:42:12 +0200 Subject: [PATCH 15/27] Add missing build dependencies --- android-file-transfer.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 4b86aa4..712251d 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -14,15 +14,18 @@ Patch0001: 0001-Fix-build-with-GCC-13-330.patch Requires: hicolor-icon-theme BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: ninja-build -BuildRequires: pkgconfig(Qt5) -BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(pybind11) -BuildRequires: pkgconfig(fuse) -BuildRequires: pkgconfig(readline) +BuildRequires: cmake(Qt5LinguistTools) BuildRequires: desktop-file-utils +BuildRequires: gcc-c++ BuildRequires: libappstream-glib +BuildRequires: ninja-build +BuildRequires: pkgconfig(fuse) +BuildRequires: pkgconfig(libmagic) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(readline) +BuildRequires: pkgconfig(taglib) %description Android File Transfer for Linux — reliable MTP client with minimalist UI @@ -72,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed May 3 2023 Marek Blaha - 4.2-9 +- Add missing build dependencies (OpenSSL, taglib, libmagic) + * Tue May 2 2023 Marek Blaha - 4.2-8 - Backport fix to build with GCC 13 From 59e8068f030ab7f3e6f8f95425f4711be319a4df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:16:00 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 712251d..e5b1580 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 3 2023 Marek Blaha - 4.2-9 - Add missing build dependencies (OpenSSL, taglib, libmagic) From c38aec2bb7db9dba4abb7347cf92627e62ef407d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:55:31 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index e5b1580..c41a37b 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 4.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4af59a593a94639c12fab4738e21e09d7f1ba069 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:02:10 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index c41a37b..11657cf 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 4.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d32da4740bde5b928b72450ce74746060d6b3760 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:58:52 +0000 Subject: [PATCH 19/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 11657cf..4847830 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 4.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fef992dd9195aa083bdb6a897c09e9e6fb707b70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:01:41 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 4847830..c335ee3 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 4.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a5a995b6f3d4709133cefbeeb8f45089caa26468 Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Tue, 1 Apr 2025 08:45:53 +0200 Subject: [PATCH 21/27] New upstream release 4.4 --- .gitignore | 1 + 0001-Fix-build-with-GCC-13-330.patch | 30 ---------------------------- android-file-transfer.spec | 14 +++++++------ sources | 2 +- 4 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 0001-Fix-build-with-GCC-13-330.patch diff --git a/.gitignore b/.gitignore index 3b3bd47..a7158e9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /android-file-transfer-linux-4.0.tar.gz /android-file-transfer-linux-4.1.tar.gz /android-file-transfer-linux-4.2.tar.gz +/android-file-transfer-linux-4.4.tar.gz diff --git a/0001-Fix-build-with-GCC-13-330.patch b/0001-Fix-build-with-GCC-13-330.patch deleted file mode 100644 index 6d55607..0000000 --- a/0001-Fix-build-with-GCC-13-330.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e8f45ff6f02d2e1e09c12f3aa708e87548d4f2bd Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 18 Apr 2023 11:38:22 +0100 -Subject: [PATCH] Fix build with GCC 13 (#330) - -GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some -are no longer transitively included. - -See https://gnu.org/software/gcc/gcc-13/porting_to.html. - -Bug: https://bugs.gentoo.org/894788 ---- - mtp/types.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mtp/types.h b/mtp/types.h -index 32024e4..676e180 100644 ---- a/mtp/types.h -+++ b/mtp/types.h -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - namespace mtp --- -2.40.0 - diff --git a/android-file-transfer.spec b/android-file-transfer.spec index c335ee3..68251a8 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -2,20 +2,18 @@ %undefine __cmake_in_source_build Name: android-file-transfer -Version: 4.2 -Release: 14%{?dist} +Version: 4.4 +Release: 1%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only URL: https://github.com/whoozle/android-file-transfer-linux Source0: %{url}/archive/v%{version}/%{name}-linux-%{version}.tar.gz -Patch0001: 0001-Fix-build-with-GCC-13-330.patch - Requires: hicolor-icon-theme BuildRequires: cmake BuildRequires: cmake(pybind11) -BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt6LinguistTools) BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: libappstream-glib @@ -23,7 +21,7 @@ BuildRequires: ninja-build BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(libmagic) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(Qt6) BuildRequires: pkgconfig(readline) BuildRequires: pkgconfig(taglib) @@ -75,6 +73,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Tue Apr 01 2025 Marek Blaha - 4.4-1 +- Update to version 4.4 +- Switch to Qt6 + * Thu Jan 16 2025 Fedora Release Engineering - 4.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6573eea..f96c2d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (android-file-transfer-linux-4.2.tar.gz) = 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 +SHA512 (android-file-transfer-linux-4.4.tar.gz) = 4d22c9535dca3471f1dd6a13bb86f78992228a0ad25b4fbdbb41f906c12c76dfffb65b04bcf2a6b08c09ecfe5e20f7b5b1d6d1fe6bb77b3e10d614324d374592 From fef9453de01e4142285543543e5d804eef1d5a9b Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Thu, 15 May 2025 09:17:50 +0200 Subject: [PATCH 22/27] New upstream release 4.5 --- .gitignore | 1 + android-file-transfer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a7158e9..efb0fe6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /android-file-transfer-linux-4.1.tar.gz /android-file-transfer-linux-4.2.tar.gz /android-file-transfer-linux-4.4.tar.gz +/android-file-transfer-linux-4.5.tar.gz diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 68251a8..a8bdc74 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -2,7 +2,7 @@ %undefine __cmake_in_source_build Name: android-file-transfer -Version: 4.4 +Version: 4.5 Release: 1%{?dist} Summary: Reliable Android MTP client with minimalist UI @@ -73,6 +73,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Thu May 15 2025 Marek Blaha - 4.5-1 +- Update to version 4.5 + * Tue Apr 01 2025 Marek Blaha - 4.4-1 - Update to version 4.4 - Switch to Qt6 diff --git a/sources b/sources index f96c2d1..0737230 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (android-file-transfer-linux-4.4.tar.gz) = 4d22c9535dca3471f1dd6a13bb86f78992228a0ad25b4fbdbb41f906c12c76dfffb65b04bcf2a6b08c09ecfe5e20f7b5b1d6d1fe6bb77b3e10d614324d374592 +SHA512 (android-file-transfer-linux-4.5.tar.gz) = 7aff608f83055a92fb35ccec768e531c60984d3fc8293c04443bb52a2eeef208c50f6baeccabd951ebc630711b07f043f6ed118bf4e308836c5c796281d68ffd From d0b9eb3ac0e68b56e9729f70853fbaa16d7236b2 Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Wed, 21 May 2025 14:28:00 +0200 Subject: [PATCH 23/27] Switch to fuse3 Upstream has transitioned from fuse to fuse3. --- android-file-transfer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index a8bdc74..73debe3 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -18,7 +18,7 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: libappstream-glib BuildRequires: ninja-build -BuildRequires: pkgconfig(fuse) +BuildRequires: pkgconfig(fuse3) BuildRequires: pkgconfig(libmagic) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(Qt6) @@ -73,6 +73,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed May 21 2025 Marek Blaha - 4.5-2 +- Switch to fuse3 + * Thu May 15 2025 Marek Blaha - 4.5-1 - Update to version 4.5 From 5aff2741aee4aac88e049c9f95d459bb295f8d4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:58:36 +0000 Subject: [PATCH 24/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 73debe3..6334779 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -73,6 +73,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed May 21 2025 Marek Blaha - 4.5-2 - Switch to fuse3 From 50eb04c092e5df0064bbc12ce8514c072c53f440 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 4 Nov 2025 11:56:29 -0500 Subject: [PATCH 25/27] rebuild for new fuse3 --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 6334779..142ec08 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -73,6 +73,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Tue Nov 4 2025 Tom Callaway - 4.5-4 +- rebuild for new fuse3 + * Wed Jul 23 2025 Fedora Release Engineering - 4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0edf255c4e7ab5c273f5b91d73cfecd700a40989 Mon Sep 17 00:00:00 2001 From: Marek Blaha Date: Fri, 21 Nov 2025 13:05:12 +0100 Subject: [PATCH 26/27] Packit configuration file --- .packit.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..bb0073b --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,16 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-rawhide + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-rawhide From 7c6350236b87c9a25ca7ca95ac5f63acf90f6bbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:40:10 +0000 Subject: [PATCH 27/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- android-file-transfer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-file-transfer.spec b/android-file-transfer.spec index 142ec08..df3c912 100644 --- a/android-file-transfer.spec +++ b/android-file-transfer.spec @@ -3,7 +3,7 @@ Name: android-file-transfer Version: 4.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Reliable Android MTP client with minimalist UI License: LGPL-2.1-only @@ -73,6 +73,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/metainfo/%{name}.appdata.xml %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Nov 4 2025 Tom Callaway - 4.5-4 - rebuild for new fuse3