From e1fde148162d46eae9768de5fa0d9475dd10f5c4 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 30 Nov 2020 10:44:43 +0000 Subject: [PATCH] Tweak KDE conditionals to only apply at runtime --- libproxy.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index 3154ce8..ee87bd3 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -4,7 +4,7 @@ Name: libproxy Version: 0.4.15 -Release: 28%{?dist} +Release: 29%{?dist} Summary: A library handling all the details of proxy configuration License: LGPLv2+ @@ -44,10 +44,6 @@ BuildRequires: pkgconfig(libnm) BuildRequires: pkgconfig(dbus-1) # webkit (gtk3) BuildRequires: pkgconfig(javascriptcoregtk-4.0) -%if 0%{?fedora} -# kde -BuildRequires: /usr/bin/kreadconfig5 -%endif # Python BuildRequires: python3-devel %else @@ -154,13 +150,18 @@ export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %{cmake} \ -DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \ -DBIPR=OFF \ +%if 0%{?fedora} + -DWITH_KDE=ON \ +%else + -DWITH_KDE=OFF \ +%endif + -DWITH_MOZJS=OFF \ -DWITH_PERL=OFF \ %if ! 0%{?bootstrap} -DWITH_GNOME3=ON \ -DWITH_PYTHON2=OFF \ -DWITH_PYTHON3=ON \ -DWITH_WEBKIT3=ON \ - -DWITH_MOZJS=OFF \ %else -DWITH_PYTHON2=OFF \ -DWITH_PYTHON3=OFF \ @@ -229,6 +230,9 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1 %changelog +* Mon Nov 30 2020 David King - 0.4.15-29 +- Tweak KDE conditionals to only apply at runtime + * Mon Nov 30 2020 David King - 0.4.15-28 - Depend on KDE only on Fedora (#1902608)