Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libproxy.git#e1fde148162d46eae9768de5fa0d9475dd10f5c4

libproxy.spec

@@ -4,7 +4,7 @@
 
 Name:           libproxy
 Version:        0.4.15
-Release:        27%{?dist}
+Release:        29%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 License:        LGPLv2+
@@ -34,7 +34,6 @@ Patch9:         libproxy-0.4.15-fix-pac-buffer-overflow.patch
 
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  gcc-c++
-BuildRequires:  libmodman-devel >= 2.0.1
 
 %if ! 0%{?bootstrap}
 # gnome
@@ -45,8 +44,6 @@ BuildRequires:  pkgconfig(libnm)
 BuildRequires:  pkgconfig(dbus-1)
 # webkit (gtk3)
 BuildRequires:  pkgconfig(javascriptcoregtk-4.0)
-# kde
-BuildRequires:  /usr/bin/kreadconfig5
 # Python
 BuildRequires:  python3-devel
 %else
@@ -96,6 +93,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    gnome
 The %{name}-gnome package contains the %{name} plugin for gnome.
 
+%if 0%{?fedora}
 %package        kde
 Summary:        Plugin for %{name} and kde
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -103,6 +101,7 @@ Requires:       /usr/bin/kreadconfig5
 
 %description    kde
 The %{name}-kde package contains the %{name} plugin for kde.
+%endif
 
 %package        networkmanager
 Summary:        Plugin for %{name} and networkmanager
@@ -151,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 \
@@ -203,8 +207,10 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1
 %{_libdir}/%{name}/%{version}/modules/config_gnome3.so
 %{_libexecdir}/pxgsettings
 
+%if 0%{?fedora}
 %files kde
 %{_libdir}/%{name}/%{version}/modules/config_kde.so
+%endif
 
 %files networkmanager
 %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
@@ -224,6 +230,12 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1
 
 
 %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
+- Depend on KDE only on Fedora (#1902608)
+
 * Tue Oct 06 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.4.15-27
 - Disable mozjs backend by default, obsolete it by webkit subpackage