rpms/libproxy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Tweak KDE conditionals to only apply at runtime

Browse Source
This commit is contained in:
David King 2020-11-30 10:44:43 +00:00
parent d2078e2269
commit e1fde14816
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libproxy.spec
View File

@ -4,7 +4,7 @@
Name: libproxy Name: libproxy
Version: 0.4.15 Version: 0.4.15
Release: 28%{?dist} Release: 29%{?dist}
Summary: A library handling all the details of proxy configuration Summary: A library handling all the details of proxy configuration
License: LGPLv2+ License: LGPLv2+
@ -44,10 +44,6 @@ BuildRequires: pkgconfig(libnm)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
# webkit (gtk3) # webkit (gtk3)
BuildRequires: pkgconfig(javascriptcoregtk-4.0) BuildRequires: pkgconfig(javascriptcoregtk-4.0)
%if 0%{?fedora}
# kde
BuildRequires: /usr/bin/kreadconfig5
%endif
# Python # Python
BuildRequires: python3-devel BuildRequires: python3-devel
%else %else
@ -154,13 +150,18 @@ export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
%{cmake} \ %{cmake} \
-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \ -DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
-DBIPR=OFF \ -DBIPR=OFF \
%if 0%{?fedora}
-DWITH_KDE=ON \
%else
-DWITH_KDE=OFF \
%endif
-DWITH_MOZJS=OFF \
-DWITH_PERL=OFF \ -DWITH_PERL=OFF \
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
-DWITH_GNOME3=ON \ -DWITH_GNOME3=ON \
-DWITH_PYTHON2=OFF \ -DWITH_PYTHON2=OFF \
-DWITH_PYTHON3=ON \ -DWITH_PYTHON3=ON \
-DWITH_WEBKIT3=ON \ -DWITH_WEBKIT3=ON \
-DWITH_MOZJS=OFF \
%else %else
-DWITH_PYTHON2=OFF \ -DWITH_PYTHON2=OFF \
-DWITH_PYTHON3=OFF \ -DWITH_PYTHON3=OFF \
@ -229,6 +230,9 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1
%changelog %changelog
* Mon Nov 30 2020 David King <amigadave@amigadave.com> - 0.4.15-29
- Tweak KDE conditionals to only apply at runtime
* Mon Nov 30 2020 David King <amigadave@amigadave.com> - 0.4.15-28 * Mon Nov 30 2020 David King <amigadave@amigadave.com> - 0.4.15-28
- Depend on KDE only on Fedora (#1902608) - Depend on KDE only on Fedora (#1902608)