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

Merged update from upstream sources

Browse Source 
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
This commit is contained in:
DistroBaker 2020-11-30 10:59:27 +00:00
parent 5d4543555c
commit 5a3e64d752
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libproxy.spec
View File

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