commit 15a436aa9264df4935b05319eeab1370e176111f
Author: Jan Rękorajski <[email protected]>
Date: Sat Jan 25 15:44:56 2025 +0100
- updated to 0.5.9
- perl/python/mozjs/etc. support removed upstream
- plugins are now buils as a single library (libpxbackend)
libproxy-pac-modules.patch | 17 ---
libproxy.spec | 340 +++++----------------------------------------
2 files changed, 34 insertions(+), 323 deletions(-)
---
diff --git a/libproxy.spec b/libproxy.spec
index 29d4059..392fa3a 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -1,55 +1,44 @@
# TODO:
-# - natus-based pacrunner (doesn't build with natus 0.2.1)
-# - ruby binding (not finished as of 0.4.8 - no buildsystem)
+# - apidocs subpackage
#
# Conditional build:
%bcond_without duktape # Duktape pacrunner plugin
%bcond_without kde # KDE 4/5 config plugin
-%bcond_without nm # NetworkManager pacrunner plugin
-%bcond_without mono # Mono C# bindings
-%bcond_without mozjs # MozJS pacrunner plugin
-%bcond_with natus # Natus pacrunner plugin [doesn't build with
natus 0.2.1]
-%bcond_without python2 # Python 2.x bindings
-%bcond_without python3 # Python 3.x bindings
-%bcond_without webkit # WebKit pacrunner plugin
-%ifarch x32
-%undefine with_mono
-%endif
Summary: Library for automatic proxy configuration management
Summary(pl.UTF-8): Biblioteka do automatycznego zarządzania konfiguracją
proxy
Name: libproxy
-Version: 0.4.18
-Release: 3
+Version: 0.5.9
+Release: 1
License: LGPL v2.1+
Group: Libraries
#Source0Download: https://github.com/libproxy/libproxy/releases
Source0:
https://github.com/libproxy/libproxy/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 21d13e5d699c3c21ab5eb2260ed9247a
-Patch0: %{name}-pac-modules.patch
+# Source0-md5: 11fd35c17e0ae017bae764fae1651973
URL: https://libproxy.github.io/libproxy/
-%{?with_nm:BuildRequires: NetworkManager-devel}
-BuildRequires: cmake >= 2.6
BuildRequires: dbus-devel
%{?with_duktape:BuildRequires: duktape-devel}
BuildRequires: glib2-devel >= 1:2.26
-%{?with_webkit:BuildRequires: gtk-webkit4-devel >= 2.6}
BuildRequires: libstdc++-devel >= 6:7
-%{?with_mono:BuildRequires: mono-csharp}
-%{?with_mozjs:BuildRequires: mozjs68-devel}
-%{?with_natus:BuildRequires: natus-devel}
-BuildRequires: perl-devel >= 1:5.8.0
+BuildRequires: meson
BuildRequires: pkgconfig
-%{?with_python2:BuildRequires: python-devel >= 1:2.5}
-%{?with_python2:BuildRequires: python-modules >= 1:2.5}
-%{?with_python3:BuildRequires: python3-devel >= 1:3.2}
-%{?with_python3:BuildRequires: python3-modules >= 1:3.2}
-BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.752
BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXmu-devel
+Requires: glib2 >= 1:2.26
+Obsoletes: dotnet-libproxy-sharp < 0.5.9
+Obsoletes: dotnet-libproxy-sharp-devel < 0.5.9
+Obsoletes: libproxy-duktape < 0.5.9
+Obsoletes: libproxy-gnome < 0.5.9
+Obsoletes: libproxy-kde < 0.5.9
+Obsoletes: libproxy-mozjs < 0.5.9
+Obsoletes: libproxy-networkmanager < 0.5.9
+Obsoletes: libproxy-pacrunner < 0.5.9
+Obsoletes: libproxy-webkit < 0.5.9
+Obsoletes: perl-Net-Libproxy < 0.5.9
+Obsoletes: python-libproxy < 0.5.9
+Obsoletes: python3-libproxy < 0.5.9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -72,72 +61,6 @@ Header files for libproxy library.
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki libproxy.
-%package -n dotnet-libproxy-sharp
-Summary: Libproxy# - libproxy .NET bindings
-Summary(pl.UTF-8): Libproxy# - wiązania libproxy dla .NET
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description -n dotnet-libproxy-sharp
-Libproxy# - libproxy .NET bindings.
-
-%description -n dotnet-libproxy-sharp -l pl.UTF-8
-Libproxy# - wiązania libproxy dla .NET.
-
-%package -n dotnet-libproxy-sharp-devel
-Summary: libproxy .NET bindings - development files
-Summary(pl.UTF-8): Wiązania libproxy dla .NET - pliki programistyczne
-Group: Development/Libraries
-Requires: dotnet-libproxy-sharp = %{version}-%{release}
-
-%description -n dotnet-libproxy-sharp-devel
-Development files for libproxy .NET bindings.
-
-%description -n dotnet-libproxy-sharp-devel -l pl.UTF-8
-Pliki programistyczne wiązań libproxy dla .NET.
-
-%package -n perl-Net-Libproxy
-Summary: libproxy Perl bindings
-Summary(pl.UTF-8): Wiązania libproxy dla Perla
-Group: Development/Languages/Perl
-Requires: %{name} = %{version}-%{release}
-
-%description -n perl-Net-Libproxy
-libproxy Perl bindings.
-
-%description -n perl-Net-Libproxy -l pl.UTF-8
-Wiązania libproxy dla Perla.
-
-%package -n python-libproxy
-Summary: libproxy Python bindings
-Summary(pl.UTF-8): Wiązania libproxy dla Pythona
-Group: Libraries/Python
-# uses libproxy shared library
-Requires: %{name} = %{version}-%{release}
-Requires: python-libs >= 1:2.5
-BuildArch: noarch
-
-%description -n python-libproxy
-libproxy Python bindings.
-
-%description -n python-libproxy -l pl.UTF-8
-Wiązania libproxy dla Pythona.
-
-%package -n python3-libproxy
-Summary: libproxy Python 3 bindings
-Summary(pl.UTF-8): Wiązania libproxy dla Pythona 3
-Group: Libraries/Python
-# uses libproxy shared library
-Requires: %{name} = %{version}-%{release}
-Requires: python3-libs >= 1:3.2
-BuildArch: noarch
-
-%description -n python3-libproxy
-libproxy Python 3 bindings.
-
-%description -n python3-libproxy -l pl.UTF-8
-Wiązania libproxy dla Pythona 3.
-
%package -n vala-libproxy
Summary: Vala bindings for libproxy API
Summary(pl.UTF-8): Wiązania API libproxy dla języka Vala
@@ -151,153 +74,25 @@ Vala bindings for libproxy API.
%description -n vala-libproxy -l pl.UTF-8
Wiązania API libproxy dla języka Vala.
-%package networkmanager
-Summary: NetworkManager network plugin for libproxy
-Summary(pl.UTF-8): Wtyczka sieci NetworkManager dla libproxy
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description networkmanager
-NetworkManager network plugin for libproxy, to query NetworkManager
-about network configuration changes.
-
-%description networkmanager -l pl.UTF-8
-Wtyczka sieci NetworkManager dla libproxy, do odpytywania
-NetworkManagera o zmiany konfiguracji sieci.
-
-%package gnome
-Summary: GNOME configuration plugin for libproxy
-Summary(pl.UTF-8): Wtyczka konfiguracji GNOME dla libproxy
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: glib2 >= 1:2.26
-
-%description gnome
-GNOME (gsettings) configuration plugin for libproxy, to query GNOME
-about proxy settings.
-
-%description gnome -l pl.UTF-8
-Wtyczka konfiguracji GNOME (gsettings) dla libproxy, do odczytu
-ustawień proxy z GNOME.
-
-%package kde
-Summary: KDE configuration plugin for libproxy
-Summary(pl.UTF-8): Wtyczka konfiguracji KDE dla libproxy
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-#Requires: kreadconfig (KDE4) or kreadconfig5 (KF5)
-
-%description kde
-KDE configuration plugin for libproxy, to query KDE about proxy
-settings.
-
-%description kde -l pl.UTF-8
-Wtyczka konfiguracji KDE dla libproxy, do odczytu ustawień proxy z
-KDE.
-
-%package pacrunner
-Summary: Pacrunner configuration plugin for libproxy
-Summary(pl.UTF-8): Wtyczka konfiguracji pacrunner dla libproxy
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description pacrunner
-Pacrunner configuration plugin for libproxy, to query pacrunner about
-proxy settings.
-
-%description pacrunner -l pl.UTF-8
-Wtyczka konfiguracji pacrunner dla libproxy, do odczytu ustawień proxy
-z pacrunnera.
-
-%package duktape
-Summary: Duktape pacrunner plugin for libproxy
-Summary(pl.UTF-8): Wtyczka pacrunner Duktape dla libproxy
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description duktape
-Duktape pacrunner plugin for libproxy, to get proxy from WPAD/PAC
-script using Duktype engine.
-
-%description duktape -l pl.UTF-8
-Wtyczka pacrunner Duktape dla libproxy, do pobierania proxy ze skryptu
-WPAD/PAC przy użyciu silnika Duktype.
-
-%package mozjs
-Summary: MozJS pacrunner plugin for libproxy
-Summary(pl.UTF-8): Wtyczka pacrunner MozJS dla libproxy
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description mozjs
-MozJS (XULrunner/JavaScript) pacrunner plugin for libproxy, to get
-proxy from WPAD/PAC script using MozJS engine.
-
-%description mozjs -l pl.UTF-8
-Wtyczka pacrunner MozJS (XULrunner/JavaScript) dla libproxy, do
-pobierania proxy ze skryptu WPAD/PAC przy użyciu silnika MozJS.
-
-%package webkit
-Summary: WebKit pacrunner plugin for libproxy
-Summary(pl.UTF-8): Wtyczka pacrunner WebKit dla libproxy
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gtk-webkit4 >= 2.6
-
-%description webkit
-WebKit (JavaScriptCore) pacrunner plugin for libproxy, to get proxy
-from WPAD/PAC script using WebKit engine.
-
-%description webkit -l pl.UTF-8
-Wtyczka pacrunner WebKit (JavaScriptCore) dla libproxy, do pobierania
-ustawień proxy ze skryptu WPAD/PAC, przy użyciu silnika WebKit.
-
%prep
%setup -q
-%patch0 -p1
-
-%if %{without natus}
-echo 'set(NATUS_FOUND 0)' > libproxy/cmake/modules/pacrunner_natus.cmk
-%endif
+#%patch0 -p1
%build
-install -d build
-cd build
-%cmake .. \
- -DLIB_INSTALL_DIR=%{_libdir} \
- -DLIBEXEC_INSTALL_DIR=%{_libdir}/libproxy \
- -DPERL_VENDORINSTALL=ON \
- -DPYTHON2_SITEPKG_DIR=%{py_sitescriptdir} \
- %{!?with_python2:-DPYTHON2=OFF} \
- -DPYTHON3_SITEPKG_DIR=%{py3_sitescriptdir} \
- %{!?with_python3:-DPYTHON3=OFF} \
- %{?with_mono:-DWITH_DOTNET=ON -DGMCS_EXECUTABLE=/usr/bin/mcs} \
- %{!?with_duktape:-DWITH_DUKTAPE=OFF} \
- %{!?with_kde:-DWITH_KDE=OFF} \
- %{?with_mozjs:-DWITH_MOZJS=ON} \
- %{!?with_nm:-DWITH_NM=OFF} \
- -DWITH_VALA=ON \
- %{!?with_webkit:-DWITH_WEBKIT=OFF} \
- %{?with_webkit:-DWITH_WEBKIT3=ON}
+%meson build \
+ %{!?with_duktape:-Dpacrunner-duktape=false} \
+ %{!?with_kde:-Dconfig-kde=false} \
+ -Drelease=true \
+ -Dvapi=true
-%{__make}
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%if %{with python2}
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_postclean
-%endif
+%ninja_install -C build
-%if %{with python3}
-%py3_comp $RPM_BUILD_ROOT%{py3_sitescriptdir}
-%py3_ocomp $RPM_BUILD_ROOT%{py3_sitescriptdir}
-%endif
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libproxy-1.0
%clean
rm -rf $RPM_BUILD_ROOT
@@ -307,90 +102,23 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc README.md
%attr(755,root,root) %{_bindir}/proxy
%attr(755,root,root) %{_libdir}/libproxy.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libproxy.so.1
%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/%{version}
-%dir %{_libdir}/%{name}/%{version}/modules
+%attr(755,root,root) %{_libdir}/%{name}/libpxbackend-1.0.so
+%{_libdir}/girepository-1.0/Libproxy-1.0.typelib
+%{_mandir}/man8/proxy.8*
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libproxy.so
-%{_includedir}/proxy.h
+%{_includedir}/libproxy
%{_pkgconfigdir}/libproxy-1.0.pc
-%{_datadir}/cmake/Modules/Findlibproxy.cmake
-
-%if %{with mono}
-%files -n dotnet-libproxy-sharp
-%defattr(644,root,root,755)
-%{_prefix}/lib/mono/gac/libproxy-sharp
-
-%files -n dotnet-libproxy-sharp-devel
-%defattr(644,root,root,755)
-%{_prefix}/lib/mono/libproxy-sharp
-%{_pkgconfigdir}/libproxy-sharp-1.0.pc
-%endif
-
-%files -n perl-Net-Libproxy
-%defattr(644,root,root,755)
-%{perl_vendorarch}/Net/Libproxy.pm
-%dir %{perl_vendorarch}/auto/Net/Libproxy
-%attr(755,root,root) %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so
-
-%if %{with python2}
-%files -n python-libproxy
-%defattr(644,root,root,755)
-%{py_sitescriptdir}/libproxy.py[co]
-%endif
-
-%if %{with python2}
-%files -n python3-libproxy
-%defattr(644,root,root,755)
-%{py3_sitescriptdir}/libproxy.py
-%{py3_sitescriptdir}/__pycache__/libproxy.cpython-*.py[co]
-%endif
+%{_datadir}/gir-1.0/Libproxy-1.0.gir
%files -n vala-libproxy
%defattr(644,root,root,755)
%{_datadir}/vala/vapi/libproxy-1.0.vapi
-
-%if %{with nm}
-%files networkmanager
-%defattr(644,root,root,755)
-%attr(755,root,root)
%{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
-%endif
-
-%files gnome
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_gnome3.so
-%attr(755,root,root) %{_libdir}/%{name}/pxgsettings
-
-%if %{with kde}
-%files kde
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_kde.so
-%endif
-
-%files pacrunner
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/config_pacrunner.so
-
-%if %{with duktape}
-%files duktape
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/pacrunner_duktape.so
-%endif
-
-%if %{with mozjs}
-%files mozjs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
-%endif
-
-%if %{with webkit}
-%files webkit
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
-%endif
+%{_datadir}/vala/vapi/libproxy-1.0.deps
diff --git a/libproxy-pac-modules.patch b/libproxy-pac-modules.patch
deleted file mode 100644
index cc439b9..0000000
--- a/libproxy-pac-modules.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Always build pacrunners as separate modules, not libproxy builtins
---- libproxy-0.4.18/libproxy/cmake/modules.cmk.orig 2023-02-26
19:37:25.969337262 +0100
-+++ libproxy-0.4.18/libproxy/cmake/modules.cmk 2023-02-26 19:51:16.691503520
+0100
-@@ -21,12 +21,7 @@ include(cmake/modules/pacrunner_webkit.c
- include(cmake/modules/pacrunner_duktape.cmk)
-
- # Build the pacrunner into libproxy unless we are building for multiple
engines
--set(BIPR 1 CACHE BOOL "Build internal pacrunner? (Always false when building
more than one PR")
--
--math(EXPR NUM_PACRUNNER
"${MOZJS_FOUND}+${NATUS_FOUND}+${WEBKIT_FOUND}+${DUKTAPE_FOUND}")
--if(NUM_PACRUNNER GREATER 1)
-- set(BIPR 0)
--endif()
-+set(BIPR 0)
-
- #
- ## Module definition
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libproxy.git/commitdiff/15a436aa9264df4935b05319eeab1370e176111f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
