!12 remove python2, don't support python2 anymore
From: @haochenstar Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
commit
38ead91e29
@ -1,6 +1,6 @@
|
||||
Name: libproxy
|
||||
Version: 0.4.15
|
||||
Release: 17
|
||||
Release: 18
|
||||
Summary: Libproxy is a library that provides automatic proxy configuration management
|
||||
|
||||
License: LGPLv2+
|
||||
@ -22,7 +22,7 @@ Patch8: libproxy-0.4.15-fix-CVE-2020-25219.patch
|
||||
|
||||
|
||||
BuildRequires: cmake >= 2.6.0 gcc-c++
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.26 pkgconfig(mozjs-68) pkgconfig(libnm) python2-devel python3-devel
|
||||
BuildRequires: pkgconfig(gio-2.0) >= 2.26 pkgconfig(mozjs-68) pkgconfig(libnm) python3-devel
|
||||
BuildRequires: pkgconfig(dbus-1) pkgconfig(javascriptcoregtk-4.0)
|
||||
|
||||
Provides: %{name}-bin %{name}-gnome %{name}-kde %{name}-mozjs %{name}-networkmanager %{name}-pacrunner
|
||||
@ -37,15 +37,6 @@ libproxy offers the following features:
|
||||
* dynamic adjustment to changing network topology.
|
||||
* a standard way of dealing with proxy settings across all scenarios.
|
||||
|
||||
%package -n python2-%{name}
|
||||
Summary: Binding for %{name} and python2
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
|
||||
%description -n python2-%{name}
|
||||
The python2 binding for libproxy.
|
||||
|
||||
%package -n python3-%{name}
|
||||
Summary: Binding for %{name} and python3
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -78,7 +69,7 @@ This package contains libraries and header files for developing applications.
|
||||
%build
|
||||
%{cmake} \
|
||||
-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
|
||||
-DWITH_PERL=OFF -DWITH_GNOME3=ON -DWITH_PYTHON2=ON -DPYTHON2_EXECUTABLE=%{__python2} \
|
||||
-DWITH_PERL=OFF -DWITH_GNOME3=ON \
|
||||
-DWITH_PYTHON3=ON -DWITH_WEBKIT3=ON -DWITH_MOZJS=ON .
|
||||
%make_build
|
||||
|
||||
@ -103,10 +94,6 @@ make test
|
||||
%{_libexecdir}/pxgsettings
|
||||
%exclude %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
|
||||
|
||||
%files -n python2-%{name}
|
||||
%defattr(-,root,root)
|
||||
%{python2_sitelib}/%{name}.*
|
||||
|
||||
%files -n python3-%{name}
|
||||
%defattr(-,root,root)
|
||||
%{python3_sitelib}/__pycache__/*
|
||||
@ -128,6 +115,12 @@ make test
|
||||
%{_mandir}/man1/proxy.1*
|
||||
|
||||
%changelog
|
||||
* Thu Oct 30 2020 xihaochen <xihaochen@huawei.com> - 0.4.15-18
|
||||
- Type:requirements
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- DESC:delete python2 dependency
|
||||
|
||||
* Thu Oct 29 liuxin <liuxin264@huawei.com> - 0.4.15-17
|
||||
- Type:cves
|
||||
- Id:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user