6 changed files with 139 additions and 53 deletions
--- a/backport-libproxy-0.4.17-fix-python-version-check.patch
+++ b/backport-libproxy-0.4.17-fix-python-version-check.patch
@ -0,0 +1,58 @@
+From 04eeeabb42436cb58e9bac2f6c31c0fb87905a72 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+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)
--- a/libproxy-0.4.17.tar.gz
+++ b/libproxy-0.4.17.tar.gz
--- a/libproxy-0.5.3.tar.gz
+++ b/libproxy-0.5.3.tar.gz
--- a/libproxy.spec
+++ b/libproxy.spec
@ -1,20 +1,22 @@
 Name:           libproxy
-Version:        0.5.3
-Release:        3
+Version:        0.4.17
+Release:        2
 Summary:        Libproxy is a library that provides automatic proxy configuration management

-License:        LGPL-2.1-or-later
+License:        LGPLv2+
 URL:            https://libproxy.github.io/libproxy/
-Source0:        https://github.com/libproxy/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/libproxy/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# Source1 comes from the Debian package.
+Source1:        proxy.1

-BuildRequires:  gcc meson vala gi-docgen chrpath
-BuildRequires:  pkgconfig(gio-2.0) >= 2.71.3 pkgconfig(gsettings-desktop-schemas) python3-devel
-BuildRequires:  pkgconfig(duktape) pkgconfig(gobject-introspection-1.0) pkgconfig(libcurl)
+Patch6000:      backport-libproxy-0.4.17-fix-python-version-check.patch
+
+BuildRequires:  cmake >= 2.6.0 gcc-c++
+BuildRequires:  pkgconfig(gio-2.0) >= 2.26 pkgconfig(libnm) python3-devel
+BuildRequires:  pkgconfig(dbus-1) pkgconfig(javascriptcoregtk-4.0) 

 Provides:       %{name}-bin %{name}-gnome %{name}-kde %{name}-networkmanager %{name}-pacrunner 
 Obsoletes:      %{name}-bin %{name}-gnome %{name}-kde %{name}-mozjs %{name}-networkmanager %{name}-pacrunner 
-Provides:       %{name}-duktape = %{version}-%{release} python3-%{name} = %{version}-%{release}
-Obsoletes:      %{name}-duktape < %{version}-%{release} python3-%{name} < %{version}-%{release}

 %description
 libproxy offers the following features:
@ -25,6 +27,23 @@ libproxy offers the following features:
    * dynamic adjustment to changing network topology.
    * a standard way of dealing with proxy settings across all scenarios.

+%package -n     python3-%{name}
+Summary:        Binding for %{name} and python3
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+%{?python_provide:%python_provide python3-%{name}}
+
+%description -n python3-%{name}
+The python3 binding for libproxy.
+
+%package        webkitgtk4
+Summary:        plugin for webkit2gtk3
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-pac = %{version}-%{release}
+
+%description    webkitgtk4
+plugin for webkit2gtk3.
+
 %package        devel
 Summary:        Libproxy provides consistent proxy configuration to applications - Development Files
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@ -38,69 +57,55 @@ This package contains libraries and header files for developing applications.
 %autosetup -p1

 %build
-%meson -Dconfig-gnome=true -Dconfig-kde=true -Dconfig-osx=false -Dconfig-windows=false -Dintrospection=true -Dtests=true -Dvapi=true
-%meson_build
+%{cmake} \
+  -DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
+  -DBIPR=OFF \
+  -DWITH_PERL=OFF -DWITH_GNOME3=ON \
+  -DWITH_PYTHON3=ON -DWITH_WEBKIT3=ON -DWITH_MOZJS=OFF .
+%make_build

 %install
-%meson_install
-chrpath -d $RPM_BUILD_ROOT%{_libdir}/*.so*
-chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/*.so
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/libproxy" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+%make_install
+
+mkdir -p %{buildroot}%{_libdir}/%{name}/%{version}/modules
+install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1

 %check
-%meson_test
+make test

 %ldconfig_scriptlets

 %files
 %defattr(-,root,root)
-%doc CHANGELOG.md README.md
+%doc AUTHORS README 
 %license COPYING
-%config(noreplace) /etc/ld.so.conf.d/*
 %{_libdir}/*.so.*
-%{_libdir}/libproxy/libpxbackend-1.0.so
-%{_libdir}/girepository-1.0/
 %{_bindir}/proxy
+%{_libdir}/%{name}/%{version}/modules/*
+%{_libexecdir}/pxgsettings
+%exclude %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
+
+%files -n python3-%{name}
+%defattr(-,root,root)
+%{python3_sitelib}/__pycache__/*
+%{python3_sitelib}/%{name}.*
+
+%files webkitgtk4
+%defattr(-,root,root)
+%{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so

 %files devel
 %defattr(-,root,root)
-%{_includedir}/libproxy/
-%{_libdir}/libproxy.so
+%{_includedir}/proxy.h
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/libproxy-1.0.pc
-%{_datadir}/vala/vapi/
-%{_datadir}/gir-1.0
+%{_datadir}/cmake/Modules/Findlibproxy.cmake

 %files help
 %defattr(-,root,root)
-%{_mandir}/man8/proxy.8*
-%{_datadir}/doc/libproxy-1.0/
+%{_mandir}/man1/proxy.1*

 %changelog
-* Mon Jul 01 2024 zhouyihang <zhouyihang3@h-partners.com> - 0.5.3-3
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:fix so file not found in non-64-bit env
-
-* Tue Aug 29 2023 zhouyihang <zhouyihang3@h-partners.com> - 0.5.3-2
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:remove rpath
-
-* Fri Aug 04 2023 zhouyihang <zhouyihang3@h-partners.com> - 0.5.3-1
- Type:requirements
- Id:NA
- SUG:NA
- DESC:update libproxy to 0.5.3
-
-* Tue Nov 08 2022 zhouyihang <zhouyihang3@h-partners.com> - 0.4.18-1
- Type:requirements
- Id:NA
- SUG:NA
- DESC:update libproxy to 0.4.18
-
 * Sat Apr 16 2022 yanglu <yanglu72@h-partners.com> - 0.4.17-2
 - Type:bugfix
 - Id:NA
--- a/libproxy.yaml
+++ b/libproxy.yaml
@ -1,4 +1,4 @@
 version_control: github
 src_repo: libproxy/libproxy
-tag_prefix: "^v"
-separator: "."
+tag_prefix: ^
+seperator: .
--- a/proxy.1
+++ b/proxy.1
@ -0,0 +1,23 @@
+.TH PROXY "1" "September 2013" "libproxy" "User Commands"
+.SH NAME
+proxy \- Display the proxy server that should be used to reach a given a network resource
+.SH SYNOPSIS
+proxy
+.SH DESCRIPTION
+Display the proxy server that should be used to reach a given a network resource.
+.PP
+libproxy is a library that provides automatic proxy configuration management
+using different backends.
+.SH EXAMPLE
+.B echo http://www.example.com/ | proxy
+  http://webcache:3128 direct://
+.SH AUTHOR
+This manual page was written by
+.MT bigon@debian.org
+Laurent Bigonville
+.ME ,
+for the Debian GNU/Linux system (but may be used by others).
+.SH SEE ALSO
+.UR http://code.google.com/p/libproxy/
+libproxy
+.UE .