diff --git a/.gitignore b/.gitignore index 51dad9e..b35c363 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/adblock-0.8.0-vendor.tar.xz /angelfish-21.12.tar.xz /angelfish-22.02.tar.xz /angelfish-22.04.tar.xz @@ -13,41 +12,3 @@ /angelfish-23.04.1.tar.xz /angelfish-23.04.2.tar.xz /angelfish-23.04.3.tar.xz -/angelfish-23.08.1.tar.xz -/angelfish-23.08.2.tar.xz -/angelfish-24.01.75.tar.xz -/angelfish-24.01.80.tar.xz -/angelfish-24.01.85.tar.xz -/angelfish-24.01.90.tar.xz -/angelfish-24.01.95.tar.xz -/angelfish-24.02.0.tar.xz -/angelfish-24.02.1.tar.xz -/angelfish-24.02.2.tar.xz -/angelfish-24.05.0.tar.xz -/angelfish-24.05.1.tar.xz -/angelfish-24.05.2.tar.xz -/angelfish-24.08.0.tar.xz -/angelfish-24.08.1.tar.xz -/angelfish-24.08.2.tar.xz -/angelfish-24.08.3.tar.xz -/angelfish-24.11.80.tar.xz -/angelfish-24.11.90.tar.xz -/angelfish-24.12.0.tar.xz -/angelfish-24.12.1.tar.xz -/angelfish-24.12.2.tar.xz -/angelfish-24.12.3.tar.xz -/angelfish-25.03.80.tar.xz -/angelfish-25.04.0.tar.xz -/angelfish-25.04.1.tar.xz -/angelfish-25.04.2.tar.xz -/angelfish-25.04.3.tar.xz -/angelfish-25.07.80.tar.xz -/angelfish-25.07.90.tar.xz -/angelfish-25.08.0.tar.xz -/angelfish-25.08.1.tar.xz -/angelfish-25.08.2.tar.xz -/angelfish-25.08.3.tar.xz -/angelfish-25.11.80.tar.xz -/angelfish-25.11.90.tar.xz -/angelfish-25.12.0.tar.xz -/angelfish-25.12.1.tar.xz diff --git a/angelfish.spec b/angelfish.spec index 7e52038..08b773e 100644 --- a/angelfish.spec +++ b/angelfish.spec @@ -1,27 +1,15 @@ -# adblock requires rust and corrosion -%bcond adblock 1 - Name: angelfish -Version: 25.12.1 +Version: 23.04.3 Release: 2%{?dist} Summary: Plasma Mobile minimal web browser -# Cargo license summary: -# MIT -# MIT OR Apache-2.0 -# MIT OR Apache-2.0 OR Zlib -# MPL-2.0 -# Unlicense OR MIT -# Zlib OR Apache-2.0 OR MIT -# Automatically converted from old format: MIT and GPLv2+ and LGPLv2 and LGPLv2+ AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) - review is highly recommended. -License: MIT AND GPL-2.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +License: MIT and GPLv2+ and LGPLv2 and LGPLv2+ # For a breakdown of the licensing, see PACKAGE-LICENSING -URL: https://invent.kde.org/network/%{name} - -Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz +URL: https://invent.kde.org/plasma-mobile/%{name} +Source0: https://download.kde.org/stable/plasma-mobile/%{version}/%{name}-%{version}.tar.xz -%{?qt6_qtwebengine_arches:ExclusiveArch: %{qt6_qtwebengine_arches}} +%{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}} BuildRequires: appstream BuildRequires: cmake @@ -29,269 +17,76 @@ BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: kf6-rpm-macros +BuildRequires: kf5-rpm-macros BuildRequires: libappstream-glib - -BuildRequires: cmake(FutureSQL6) -BuildRequires: cmake(KF6Crash) -BuildRequires: cmake(KF6Config) -BuildRequires: cmake(KF6CoreAddons) -BuildRequires: cmake(KF6DBusAddons) -BuildRequires: cmake(KF6I18n) -BuildRequires: cmake(KF6Kirigami) -BuildRequires: cmake(KF6KirigamiAddons) -BuildRequires: cmake(KF6Notifications) -BuildRequires: cmake(KF6Purpose) -BuildRequires: cmake(KF6QQC2DesktopStyle) -BuildRequires: cmake(KF6WindowSystem) -BuildRequires: cmake(QCoro6Core) -BuildRequires: cmake(QCoro6Quick) -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6Quick) -BuildRequires: cmake(Qt6QuickControls2) -BuildRequires: cmake(Qt6Sql) -BuildRequires: cmake(Qt6Svg) -BuildRequires: cmake(Qt6Test) -BuildRequires: cmake(Qt6WebEngineCore) -BuildRequires: cmake(Qt6WebEngineQuick) -BuildRequires: cmake(Qt6Widgets) -BuildRequires: cmake(Qt6QmlPrivate) -BuildRequires: cmake(Qt6CorePrivate) - -%if %{with adblock} -BuildRequires: cmake(Corrosion) -BuildRequires: rust-packaging -%endif + +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Kirigami2) +BuildRequires: cmake(KF5KirigamiAddons) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5Purpose) +BuildRequires: cmake(KF5QQC2DesktopStyle) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Feedback) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Keychain) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(Qt5QuickControls2) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5WebEngine) +BuildRequires: cmake(Qt5WebSockets) +BuildRequires: cmake(Qt5Widgets) Requires: hicolor-icon-theme # QML module dependencies -Requires: kf6-kirigami%{?_isa} -Requires: kf6-kirigami-addons%{?_isa} -Requires: kf6-purpose%{?_isa} -Requires: kf6-qqc2-desktop-style%{?_isa} -Requires: qt6-qt5compat%{?_isa} -Requires: qt6-qtwayland%{?_isa} -Requires: qt6-qtwebengine%{?_isa} +Requires: kf5-kirigami2%{?_isa} +Requires: kf5-kirigami2-addons%{?_isa} +Requires: kf5-purpose%{?_isa} +Requires: qt5-qtfeedback%{?_isa} +Requires: qt5-qtgraphicaleffects%{?_isa} +Requires: qt5-qtquickcontrols2%{?_isa} +Requires: qt5-qtwayland%{?_isa} +Requires: qt5-qtwebengine%{?_isa} %description Web browser for mobile devices with Plasma integration %prep -%autosetup -n %{name}-%{version} -p1 -%if %{with adblock} -%cargo_prep -%endif - -%if %{with adblock} -%generate_buildrequires -%cargo_generate_buildrequires -%endif +%autosetup -n %{name}-%{version} %build -%cmake_kf6 +%cmake_kf5 %cmake_build -%if %{with adblock} -# Rust dependency handling -%cargo_license_summary -%{cargo_license} > LICENSE.dependencies -%endif %install %cmake_install %find_lang %{name} %check -desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.desktop -appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml %files -f %{name}.lang %license LICENSES/{MIT,GPL-2.0-or-later,LGPL-2.0-only,LGPL-2.0-or-later}.txt -%if %{with adblock} -%license LICENSE.dependencies -%endif %doc README.md -%{_kf6_bindir}/%{name} -%{_kf6_bindir}/%{name}-webapp +%{_kf5_bindir}/%{name} +%{_kf5_bindir}/%{name}-webapp -%{_kf6_datadir}/applications/org.kde.%{name}.desktop -%{_kf6_datadir}/config.kcfg/%{name}settings.kcfg -%{_kf6_datadir}/icons/hicolor/scalable/apps/org.kde.%{name}.svg -%{_kf6_datadir}/knotifications6/%{name}.notifyrc +%{_kf5_datadir}/applications/org.kde.%{name}.desktop +%{_kf5_datadir}/config.kcfg/%{name}settings.kcfg +%{_kf5_datadir}/icons/hicolor/scalable/apps/org.kde.%{name}.svg +%{_kf5_datadir}/knotifications5/%{name}.notifyrc -%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml +%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 25.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jan 07 2026 farchord@gmail.com - 25.12.1-1 -- 25.12.1 - -* Sat Dec 06 2025 Steve Cossette - 25.12.0-1 -- 25.12.0 - -* Fri Nov 28 2025 Steve Cossette - 25.11.90-1 -- 25.11.90 - -* Sat Nov 15 2025 Steve Cossette - 25.11.80-1 -- 25.11.80 - -* Tue Nov 04 2025 Steve Cossette - 25.08.3-1 -- 25.08.3 - -* Wed Oct 08 2025 Steve Cossette - 25.08.2-1 -- 25.08.2 - -* Sun Sep 21 2025 Steve Cossette - 25.08.1-1 -- 25.08.1 - -* Fri Aug 08 2025 Steve Cossette - 25.08.0-1 -- 25.08.0 - -* Fri Jul 25 2025 Steve Cossette - 25.07.90-1 -- 25.07.90 - -* Wed Jul 23 2025 Fedora Release Engineering - 25.07.80-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jul 11 2025 Steve Cossette - 25.07.80-1 -- 25.07.80 - -* Thu Jul 03 2025 Steve Cossette - 25.04.3-1 -- 25.04.3 - -* Wed Jun 04 2025 Steve Cossette - 25.04.2-1 -- 25.04.2 - -* Wed May 14 2025 Steve Cossette - 25.04.1-1 -- 25.04.1 - -* Mon Apr 14 2025 Jan Grulich - 25.04.0-2 -- Rebuild (qt6) - -* Sat Apr 12 2025 Steve Cossette - 25.04.0-1 -- 25.04.0 - -* Tue Mar 25 2025 Jan Grulich - 25.03.80-2 -- Rebuild (qt6) - -* Thu Mar 20 2025 Steve Cossette - 25.03.80-1 -- 25.03.80 (Beta) - -* Tue Mar 04 2025 Steve Cossette - 24.12.3-1 -- 24.12.3 - -* Fri Feb 21 2025 Steve Cossette - 24.12.2-2 -- Rebuild for ppc64le enablement - -* Wed Feb 05 2025 Steve Cossette - 24.12.2-1 -- 24.12.2 - -* Thu Jan 16 2025 Fedora Release Engineering - 24.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 07 2025 Steve Cossette - 24.12.1-1 -- 24.12.1 - -* Sat Dec 07 2024 Marc Deop i Argemí - 24.12.0-1 -- 24.12.0 - -* Fri Nov 29 2024 Marc Deop i Argemí - 24.11.90-1 -- 24.11.90 - -* Fri Nov 15 2024 Marc Deop i Argemí - 24.11.80-1 -- 24.11.80 - -* Tue Nov 05 2024 Steve Cossette - 24.08.3-1 -- 24.08.3 - -* Mon Oct 14 2024 Jan Grulich - 24.08.2-2 -- Rebuild (qt6) - -* Tue Oct 08 2024 Steve Cossette - 24.08.2-1 -- 24.08.2 - -* Wed Sep 25 2024 Alessandro Astone - 24.08.1-1 -- 24.08.1 - -* Thu Aug 22 2024 Steve Cossette - 24.08.0-1 -- 24.08.0 - -* Wed Jul 17 2024 Fedora Release Engineering - 24.05.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Jul 07 2024 Marc Deop i Argemí - 24.05.2-1 -- 24.05.2 - -* Fri Jun 14 2024 Marc Deop i Argemí - 24.05.1-1 -- 24.05.1 - -* Thu May 23 2024 Alessandro Astone - 24.05.0-2 -- Respin tarball with stable release - -* Fri May 17 2024 Marc Deop i Argemí - 24.05.0-1 -- 24.05.0 - -* Fri Apr 12 2024 Marc Deop i Argemí - 24.02.2-1 -- 24.02.2 - -* Thu Apr 04 2024 Jan Grulich - 24.02.1-3 -- Rebuild (qt6) - -* Thu Apr 04 2024 Jan Grulich - 24.02.1-2 -- Rebuild (qt6) - -* Fri Mar 29 2024 Marc Deop i Argemí - 24.02.1-1 -- 24.02.1 - -* Thu Mar 28 2024 Neal Gompa - 24.02.0-3 -- Add adblock build conditional back - -* Tue Mar 26 2024 Steve Cossette - 24.02.0-2 -- Switching from vendored adblock to fedora package - -* Wed Feb 21 2024 Marc Deop i Argemí - 24.02.0-1 -- 24.02.0 - -* Fri Feb 16 2024 Jan Grulich - 24.01.95-3 -- Rebuild (qt6) - -* Mon Feb 05 2024 Yaakov Selkowitz - 24.01.95-2 -- Enable adblock - -* Wed Jan 31 2024 Marc Deop i Argemí - 24.01.95-1 -- 24.01.95 - -* Mon Jan 22 2024 Fedora Release Engineering - 24.01.90-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 24.01.90-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 11 2024 Marc Deop i Argemí - 24.01.90-1 -- 24.01.90 - -* Sat Dec 23 2023 ales.astone@gmail.com - 24.01.85-1 -- 24.01.85 - -* Sun Dec 03 2023 Yaakov Selkowitz - 24.01.80-1 -- 24.01.80 - -* Wed Nov 29 2023 Jan Grulich - 24.01.75-2 -- Rebuild (qt6) - -* Thu Nov 23 2023 Yaakov Selkowitz - 24.01.75-1 -- 24.01.75 - -* Thu Oct 12 2023 Marc Deop i Argemí - 23.08.2-1 -- 23.08.2 - -* Thu Oct 05 2023 Yaakov Selkowitz - 23.08.1-1 -- 23.08.1 - * Wed Jul 19 2023 Fedora Release Engineering - 23.04.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 99e1c4a..579cb93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (angelfish-25.12.1.tar.xz) = 640c224b3017c2e951bc5bd3952b50a338712fb93c1ce108fd269d2333a8557dd1dd7e62d40bb12e8dc116bf217a4b8e1e57475783e23d2b69babf6902bae729 +SHA512 (angelfish-23.04.3.tar.xz) = 1f9098c331be21a71d51d5e89aa13df593f732a8b1cff2697b49154b6367cc099d0a1f117b75efa884459769a72f6de5a0066b5286ef5bde56a8a89b0fd87641