From fed10e7b6893124037fc578e59abcec65d8449ba Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mar 28 2024 20:48:12 +0000 Subject: Add adblock build conditional back This will be useful if we need to be able to build on architectures that Rust is unavailable on. --- diff --git a/angelfish.spec b/angelfish.spec index 36914cf..2c82cc5 100644 --- a/angelfish.spec +++ b/angelfish.spec @@ -1,6 +1,9 @@ +# adblock requires rust and corrosion +%bcond adblock 1 + Name: angelfish Version: 24.02.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plasma Mobile minimal web browser # Cargo license summary: @@ -53,8 +56,10 @@ BuildRequires: cmake(Qt6WebEngineQuick) BuildRequires: cmake(Qt6Widgets) BuildRequires: qt6-qtbase-private-devel +%if %{with adblock} BuildRequires: cmake(Corrosion) BuildRequires: rust-packaging +%endif Requires: hicolor-icon-theme # QML module dependencies @@ -71,17 +76,23 @@ Web browser for mobile devices with Plasma integration %prep %autosetup -n %{name}-%{version} +%if %{with adblock} %cargo_prep +%endif +%if %{with adblock} %generate_buildrequires %cargo_generate_buildrequires +%endif %build %cmake_kf6 %cmake_build +%if %{with adblock} # Rust dependency handling %cargo_license_summary %{cargo_license} > LICENSE.dependencies +%endif %install %cmake_install @@ -94,7 +105,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{ %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} @@ -108,6 +121,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{ %{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml %changelog +* 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