diff --git a/libproxy-0.4.17-fix-python-version-check.patch b/libproxy-0.4.17-fix-python-version-check.patch deleted file mode 100644 index e4affb0ed0546f382c63de4c0bdbcdf536eba594..0000000000000000000000000000000000000000 --- a/libproxy-0.4.17-fix-python-version-check.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 04eeeabb42436cb58e9bac2f6c31c0fb87905a72 Mon Sep 17 00:00:00 2001 -From: David King -Date: Mon, 21 Jun 2021 17:10:43 +0100 -Subject: [PATCH] python: Support Python 3.10 and above -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As suggested by Miro Hrončok, change the way that the Python interpreter -version is found. Additionally, update the static list of accepted -Python 3 versions. - -https://bugzilla.redhat.com/show_bug.cgi?id=1898060 ---- - bindings/python/python2/CMakeLists.txt | 2 +- - bindings/python/python3/CMakeLists.txt | 2 +- - cmake/FindPython3Interp.cmake | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/bindings/python/python2/CMakeLists.txt b/bindings/python/python2/CMakeLists.txt -index 00df551..f4d2b91 100644 ---- a/bindings/python/python2/CMakeLists.txt -+++ b/bindings/python/python2/CMakeLists.txt -@@ -6,7 +6,7 @@ if(PYTHON2INTERP_FOUND) - if(NOT PYTHON2_SITEPKG_DIR) - execute_process(COMMAND - ${PYTHON2_EXECUTABLE} -- -c "import sys; print (sys.version[0:3])" -+ -c "import sys; print('{}.{}'.format(*sys.version_info[0:2]))" - OUTPUT_VARIABLE PYTHON2_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - -diff --git a/bindings/python/python3/CMakeLists.txt b/bindings/python/python3/CMakeLists.txt -index bf87dfc..fc3b24b 100644 ---- a/bindings/python/python3/CMakeLists.txt -+++ b/bindings/python/python3/CMakeLists.txt -@@ -6,7 +6,7 @@ if(PYTHON3INTERP_FOUND) - if(NOT PYTHON3_SITEPKG_DIR) - execute_process(COMMAND - ${PYTHON3_EXECUTABLE} -- -c "import sys; print (sys.version[0:3])" -+ -c "import sys; print('{}.{}'.format(*sys.version_info[0:2]))" - OUTPUT_VARIABLE PYTHON3_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - -diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake -index 74398b2..5b25e5a 100644 ---- a/cmake/FindPython3Interp.cmake -+++ b/cmake/FindPython3Interp.cmake -@@ -39,7 +39,7 @@ - - unset(_Python3_NAMES) - --set(_Python3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_Python3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(Python3Interp_FIND_VERSION) - if(Python3Interp_FIND_VERSION_COUNT GREATER 1) --- -2.31.1 - diff --git a/libproxy-0.4.17.tar.xz b/libproxy-0.4.17.tar.xz deleted file mode 100644 index 1873f516613d285f191d273eaeed5c2c9e4e3a65..0000000000000000000000000000000000000000 Binary files a/libproxy-0.4.17.tar.xz and /dev/null differ diff --git a/libproxy-0.4.18.tar.xz b/libproxy-0.4.18.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..f44dbea43893ffc26aab508982eb787b5859e20f Binary files /dev/null and b/libproxy-0.4.18.tar.xz differ diff --git a/libproxy.spec b/libproxy.spec index c688db9dc7f5e5774b5d356768ab10fed823093e..c507eed22efd273ca7f66ad46c4200a71fbf885a 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -2,7 +2,7 @@ %{!?_with_bootstrap: %global bootstrap 0} Name: libproxy -Version: 0.4.17 +Version: 0.4.18 Release: %{anolis_release}%{?dist} Summary: A library handling all the details of proxy configuration @@ -11,8 +11,6 @@ URL: https://libproxy.github.io/libproxy/ Source0: https://github.com/libproxy/%{name}/releases/download/%{name}-%{version}.tar.xz # Taken from the Debian package. Source1: proxy.1 -# Fix the problem that matches python 3.10 but matches python 3.1 -Patch0: libproxy-0.4.17-fix-python-version-check.patch BuildRequires: cmake >= 2.6.0 BuildRequires: gcc-c++ @@ -49,9 +47,17 @@ libproxy offers the following features: * a sublime sense of joy and accomplishment +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %package bin Summary: Binary to test %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description bin The %{name}-bin package contains the proxy binary for %{name} @@ -68,7 +74,7 @@ The python3 binding for %{name} %package gnome Summary: Plugin for %{name} and gnome -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description gnome The %{name}-gnome package contains the %{name} plugin for gnome. @@ -76,7 +82,7 @@ The %{name}-gnome package contains the %{name} plugin for gnome. %package networkmanager Summary: Plugin for %{name} and networkmanager -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description networkmanager The %{name}-networkmanager package contains the %{name} plugin @@ -84,7 +90,7 @@ for networkmanager. %package webkitgtk4 Summary: Plugin for %{name} and webkitgtk3 -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} Obsoletes: %{name}-mozjs <= %{version}-%{release} @@ -94,7 +100,7 @@ webkitgtk3. %package pacrunner Summary: Plugin for %{name} and PacRunner -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Provides: %{name}-pac = %{version}-%{release} Requires: pacrunner @@ -106,7 +112,7 @@ PacRunner. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -154,13 +160,15 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1 %files -%doc AUTHORS README %license COPYING %{_libdir}/*.so.* %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/%{version} %dir %{_libdir}/%{name}/%{version}/modules +%files doc +%doc AUTHORS README + %files bin %{_bindir}/proxy %{_mandir}/man1/proxy.1* @@ -193,6 +201,9 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1 %changelog +* Wed Sep 21 2022 mgb01105731 - 0.4.18-1 +- update to 0.4.18 + * Thu Apr 07 2022 mgb01105731 - 0.4.17-1 - Init from upstream version 0.4.17