diff --git a/libproxy.spec b/libproxy.spec index 401b036..042a04c 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -4,7 +4,7 @@ Name: libproxy Version: 0.4.15 -Release: 26%{?dist} +Release: 27%{?dist} Summary: A library handling all the details of proxy configuration License: LGPLv2+ @@ -39,8 +39,6 @@ BuildRequires: libmodman-devel >= 2.0.1 %if ! 0%{?bootstrap} # gnome BuildRequires: pkgconfig(gio-2.0) >= 2.26 -# mozjs -BuildRequires: pkgconfig(mozjs-68) # NetworkManager BuildRequires: pkgconfig(libnm) # pacrunner (and NetworkManager) @@ -106,14 +104,6 @@ Requires: /usr/bin/kreadconfig5 %description kde The %{name}-kde package contains the %{name} plugin for kde. -%package mozjs -Summary: Plugin for %{name} and mozjs -Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: %{name}-pac = %{version}-%{release} - -%description mozjs -The %{name}-mozjs package contains the %{name} plugin for mozjs. - %package networkmanager Summary: Plugin for %{name} and networkmanager Requires: %{name}%{?_isa} = %{version}-%{release} @@ -126,6 +116,7 @@ for networkmanager. Summary: Plugin for %{name} and webkitgtk3 Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} +Obsoletes: %{name}-mozjs <= %{version}-%{release} %description webkitgtk4 The %{name}-webkitgtk4 package contains the %{name} plugin for @@ -159,13 +150,14 @@ developing applications that use %{name}. export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %{cmake} \ -DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \ + -DBIPR=OFF \ -DWITH_PERL=OFF \ %if ! 0%{?bootstrap} -DWITH_GNOME3=ON \ -DWITH_PYTHON2=OFF \ -DWITH_PYTHON3=ON \ -DWITH_WEBKIT3=ON \ - -DWITH_MOZJS=ON \ + -DWITH_MOZJS=OFF \ %else -DWITH_PYTHON2=OFF \ -DWITH_PYTHON3=OFF \ @@ -214,9 +206,6 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1 %files kde %{_libdir}/%{name}/%{version}/modules/config_kde.so -%files mozjs -%{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so - %files networkmanager %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so @@ -235,6 +224,9 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1 %changelog +* Tue Oct 06 2020 Frantisek Zatloukal - 0.4.15-27 +- Disable mozjs backend by default, obsolete it by webkit subpackage + * Tue Sep 29 2020 David King - 0.4.15-26 - Fix PAC buffer overflow (#1883584)