pool/libproxy
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 33973 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/libproxy based on submit request 33973 from user dimstar

OBS-URL: https://build.opensuse.org/request/show/33973
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=12
This commit is contained in:
OBS User autobuild 2010-03-05 01:14:28 +00:00 committed by Git OBS Bridge
commit 6756db9ba5
10 changed files with 323 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
baselibs.conf
View File

@ -1,12 +1,12 @@
libproxy0 libproxy1
libproxy0-config-gnome libproxy1-config-gnome
supplements "packageand(libproxy0-<targettype>:libproxy0-gnome)" supplements "packageand(libproxy1-<targettype>:libproxy1-gnome)"
libproxy0-config-kde libproxy1-config-kde
supplements "packageand(libproxy0-<targettype>:libproxy0-kde)" supplements "packageand(libproxy1-<targettype>:libproxy1-kde)"
libproxy0-pacrunner-mozjs libproxy1-pacrunner-mozjs
supplements "packageand(libproxy0-<targettype>:libproxy0-mozjs)" supplements "packageand(libproxy1-<targettype>:libproxy1-mozjs)"
libproxy0-networkmanager libproxy1-networkmanager
supplements "packageand(libproxy0-<targettype>:libproxy0-networkmanager)" supplements "packageand(libproxy1-<targettype>:libproxy1-networkmanager)"
libproxy0-pacrunner-webkit libproxy1-pacrunner-webkit
supplements "packageand(libproxy0-<targettype>:libproxy0-webkit)" supplements "packageand(libproxy1-<targettype>:libproxy1-webkit)"

3
libproxy-0.3.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82e27b1b391fbf36ae1433729b7431739212171fbffc34c55eb75b60e20998fb
size 315526

3
libproxy-0.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d45dea80cdba266e874284c4f6bcd919d99d18ace62da2fd53c4e9ab04621d4
size 58637

13
libproxy-libexecpath.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libproxy-0.4.0/CMakeLists.txt
===================================================================
--- libproxy-0.4.0.orig/CMakeLists.txt
+++ libproxy-0.4.0/CMakeLists.txt
@@ -38,7 +38,7 @@ if(${WIN32})
else()
set(rlibdir lib${LIB_SUFFIX}/)
set(rmoduledir ${rlibdir}/${CMAKE_PROJECT_NAME}/${CMAKE_PROJECT_VERSION}/modules/)
- set(rlibexecdir libexec/)
+ set(rlibexecdir lib/${CMAKE_PROJECT_NAME})
set(rbindir bin/)
set(rincludedir include/)
endif()

13
libproxy-pkgconfig.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libproxy-0.4.0/libproxy/CMakeLists.txt
===================================================================
--- libproxy-0.4.0.orig/libproxy/CMakeLists.txt
+++ libproxy-0.4.0/libproxy/CMakeLists.txt
@@ -137,7 +137,7 @@ message("")
### Misc files
# PkgConfig file
-if(NOT ${WIN32})
+if(NOT WIN32)
configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY)
install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig)
endif()

31
libproxy-plugins.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Feb 26 09:44:18 CET 2010 - dimstar@opensuse.org
- Update to version 0.4.0:
+ C++ rewrite
+ Small API change (px_proxy_factory_get_proxy() can now return
NULL)
+ SOVERSION bump
+ libmodman is now a separate library
+ Migrate to cmake
+ Windows support (config_w32reg, ignore_hostname; VC++ support)
+ MacOSX support (config_macosx, ignore_hostname)
+ Built-in modules support
+ Support for chunked encoding
+ Move to hidden visibility by default
+ KDE's KConfig semantics are fully supported
+ Removeal of all PX_* env variables (no longer needed)
+ Symbol based detection of relevant pacrunner
+ Reworked config_gnome to not suck (its *much* faster)
+ Many other things I can't remember
- BuildRequire cmake, gccc-++ and zlib-devel
- Add libproxy-pysitelib.patch, as the python bindings are are
arch-independent
- Add libproxy-libexecpatch.patch to move library helpers to proper
libexecdir.
- Build the python-package as noarch
- sonum bump to 1, thus changing name to libproxy1
- Split out libmodman (will not follow the versioning of libproxy
in the long run).
- Add libproxy-pkgconfig.patch to also install the .pc file.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 5 17:17:30 CET 2010 - jengelh@medozas.de Tue Jan 5 17:17:30 CET 2010 - jengelh@medozas.de

248
libproxy-plugins.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package libproxy-plugins (Version 0.3.1) # spec file for package libproxy-plugins (Version 0.4.0)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -33,28 +33,38 @@ Url: http://code.google.com/p/libproxy/
Name: libproxy-plugins Name: libproxy-plugins
Group: System/Libraries Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to applications Summary: Libproxy provides consistent proxy configuration to applications
Version: 0.3.1 Version: 0.4.0
Release: 2 Release: 1
Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-pysitelib.patch dimstar@opensuse.org -- The bindings are arch-independent to be installed
Patch0: libproxy-pysitelib.patch
# PATCH-FIX-UPSTREAM libproxy-libexecpatch.patch dimstar@opensuse.org -- Use proper libexecdir
Patch1: libproxy-libexecpath.patch
# PATCH-FIX-UPSTREAM libproxy-pkgconfig.patch dimstar@opensuse.org -- Install pkgconfig files, taken from upstream svn.
Patch2: libproxy-pkgconfig.patch
License: LGPLv2.1+ License: LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: python-devel BuildRequires: zlib-devel
%if !%build_core_not_modules %if !%build_core_not_modules
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
BuildRequires: gconf2-devel BuildRequires: gconf2-devel
# For directory ownership, but also because we want to rebuild the modules if # For directory ownership, but also because we want to rebuild the modules if
# the library changed # the library changed
BuildRequires: libproxy0 BuildRequires: libproxy1
BuildRequires: gcc-c++
BuildRequires: libwebkit-devel BuildRequires: libwebkit-devel
BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: xorg-x11-libXmu-devel BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libkde4-devel BuildRequires: libkde4-devel
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
%else
BuildRequires: python-devel
%endif %endif
%if %suse_version <= 1110 %if %suse_version <= 1110
%define python_sitelib %{py_sitedir} %define python_sitelib %{py_sitedir}
%endif %endif
@ -76,10 +86,11 @@ libproxy offers the following features: * extremely small core
%if %build_core_not_modules %if %build_core_not_modules
%package tools %package tools
License: GPL v2 or later ; LGPL v2.1 or later License: GPLv2+ ; LGPLv2.1+
Summary: A simple application using libproxy Summary: A simple application using libproxy
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Requires: libmodman0 = %{version}
%description tools %description tools
A simple application that will use libproxy to give the results you can A simple application that will use libproxy to give the results you can
@ -88,10 +99,10 @@ happen in various cases.
%package devel %package devel
License: GPL v2 or later ; LGPL v2.1 or later License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications - Development Files Summary: Libproxy provides consistent proxy configuration to applications - Development Files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
%description devel %description devel
libproxy offers the following features: * extremely small core libproxy offers the following features: * extremely small core
@ -107,12 +118,12 @@ libproxy offers the following features: * extremely small core
* a standard way of dealing with proxy settings across all scenarios * a standard way of dealing with proxy settings across all scenarios
%package -n libproxy0 %package -n libproxy1
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications Summary: Libproxy provides consistent proxy configuration to applications
Group: System/Libraries Group: System/Libraries
%description -n libproxy0 %description -n libproxy1
libproxy offers the following features: * extremely small core libproxy offers the following features: * extremely small core
footprint (< 35K) footprint (< 35K)
@ -125,12 +136,23 @@ libproxy offers the following features: * extremely small core
* a standard way of dealing with proxy settings across all scenarios * a standard way of dealing with proxy settings across all scenarios
%package -n libmodman0_0_0
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy's Module Management Library
Group: System/Libraries
%description -n libmodman0_0_0
A module management library taking care of loading / unload modules
including heuristics in detecting which bindings might already
be used by an application and favouring this one.
%package -n python-libproxy %package -n python-libproxy
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Python bindings for libproxy Summary: Python bindings for libproxy
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} BuildArch: noarch
Requires: libproxy1 = %{version}
%py_requires %py_requires
%description -n python-libproxy %description -n python-libproxy
@ -151,7 +173,7 @@ libproxy offers the following features: * extremely small core
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: .Net bindings for libproxy Summary: .Net bindings for libproxy
Group: Development/Languages/Mono Group: Development/Languages/Mono
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
%description -n libproxy-sharp %description -n libproxy-sharp
libproxy offers the following features: * extremely small core libproxy offers the following features: * extremely small core
@ -169,230 +191,170 @@ libproxy offers the following features: * extremely small core
%else %else
%package -n libproxy0-config-gnome %package -n libproxy1-config-gnome
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for GNOME configuration Summary: Libproxy module for GNOME configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Recommends: libproxy0-pacrunner = %{version} Recommends: libproxy1-pacrunner = %{version}
Recommends: libproxy0-wpad-dns = %{version} Recommends: libproxy1-wpad-dns = %{version}
Supplements: packageand(libproxy0:gconf2) Supplements: packageand(libproxy1:gconf2)
Provides: libproxy-gnome = %{version} Provides: libproxy-gnome = %{version}
Obsoletes: libproxy-gnome < %{version} Obsoletes: libproxy-gnome < %{version}
Provides: libproxy0-gnome = %{version}
Obsoletes: libproxy0-gnome < %{version}
%description -n libproxy0-config-gnome %description -n libproxy1-config-gnome
A module to extend libproxy with capabilities to query GNOME about A module to extend libproxy with capabilities to query GNOME about
proxy settings. proxy settings.
%package -n libproxy0-config-kde4 %package -n libproxy1-config-kde4
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for KDE configuration Summary: Libproxy module for KDE configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Recommends: libproxy0-pacrunner = %{version} Recommends: libproxy1-pacrunner = %{version}
Recommends: libproxy0-wpad-dns = %{version} Recommends: libproxy1-wpad-dns = %{version}
Supplements: packageand(libproxy0:libkde4) Supplements: packageand(libproxy1:libkde4)
Provides: libproxy-kde = %{version} Provides: libproxy-kde = %{version}
Obsoletes: libproxy-kde < %{version} Obsoletes: libproxy-kde < %{version}
Provides: libproxy0-kde = %{version}
Obsoletes: libproxy0-kde < %{version}
Obsoletes: libproxy0-config-kde <= %{version}
%description -n libproxy0-config-kde4 %description -n libproxy1-config-kde4
A module to extend libproxy with capabilities to query KDE4 about proxy A module to extend libproxy with capabilities to query KDE4 about proxy
settings. settings.
%package -n libproxy0-pacrunner-mozjs %package -n libproxy1-pacrunner-mozjs
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Supplements: packageand(libproxy0:mozilla-xulrunner%{xulrunner_ver}) Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver})
# A virtual symbol to identify that this is a pacrunner. # A virtual symbol to identify that this is a pacrunner.
Provides: libproxy0-pacrunner = %{version} Provides: libproxy1-pacrunner = %{version}
Provides: libproxy-mozjs = %{version}
Obsoletes: libproxy-mozjs < %{version}
Provides: libproxy0-mozjs = %{version}
Obsoletes: libproxy0-mozjs < %{version}
%description -n libproxy0-pacrunner-mozjs %description -n libproxy1-pacrunner-mozjs
A module to extend libproxy with capabilities to pass addresses to a A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy. WPAD/PAC script and have it find the correct proxy.
%package -n libproxy0-pacrunner-webkit %package -n libproxy1-pacrunner-webkit
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Supplements: packageand(libproxy0:libwebkit-1) Supplements: packageand(libproxy1:libwebkit-1)
# A virtual symbol to identify that this is a pacrunner. # A virtual symbol to identify that this is a pacrunner.
Provides: libproxy0-pacrunner = %{version} Provides: libproxy1-pacrunner = %{version}
Provides: libproxy-webkit = %{version}
Obsoletes: libproxy-webkit < %{version}
Provides: libproxy0-webkit = %{version}
Obsoletes: libproxy0-webkit < %{version}
%description -n libproxy0-pacrunner-webkit %description -n libproxy1-pacrunner-webkit
A module to extend libproxy with capabilities to pass addresses to a A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy. WPAD/PAC script and have it find the correct proxy.
%package -n libproxy0-networkmanager %package -n libproxy1-networkmanager
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for NetworkManager configuration Summary: Libproxy module for NetworkManager configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Supplements: packageand(libproxy0:NetworkManager) Supplements: packageand(libproxy1:NetworkManager)
Provides: libproxy-networkmanager = %{version}
Obsoletes: libproxy-networkmanager < %{version}
%description -n libproxy0-networkmanager %description -n libproxy1-networkmanager
A module to extend libproxy with capabilities to query NetworkManager A module to extend libproxy with capabilities to query NetworkManager
about network configuration changes. about network configuration changes.
%package -n libproxy0-config-wpad
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for WPAD autofallback
Group: System/Libraries
Requires: libproxy0 = %{version}
Requires: libproxy0-wpad-dns = %{version}
%description -n libproxy0-config-wpad
A module to extend libproxy with capabilities to query wpad://
in case no other module returns valid configuration.
This might not be wanted in tight security environments.
%package -n libproxy0-wpad-dns
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for WPAD Autofallback
Group: System/Libraries
Requires: libproxy0 = %{version}
Requires: libproxy0-pacrunner = %{version}
Recommends: libproxy-wpad-dns-devolution = %{version}
%description -n libproxy0-wpad-dns
This modules performs the DNS queries needed to find the wpad://
configuration.
The module is needed whenever automatic proxy configuration is used.
%package -n libproxy0-wpad-dns-devolution
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for WPAD Autofallback
Group: System/Libraries
Requires: libproxy0 = %{version}
Requires: libproxy0-pacrunner = %{version}
Requires: libproxy0-wpad-dns = %{version}
%description -n libproxy0-wpad-dns-devolution
A module to extend wpad:// capabilities of libproxy with DNS
devolution.
The module is written with care and it will never fall back to the
.TLD domains.
%endif %endif
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build %build
%configure \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
%if %build_core_not_modules %ifarch x86_64
--without-wpad \ -DLIB_SUFFIX=64 \
%endif %endif
--with-python \ .
--disable-static # THAT DOT BELONGS TO THE CMAKE CALL
%{__make} %{?jobs:-j%jobs} %{__make} %{?jobs:-j%jobs}
%install %install
%makeinstall
%if %build_core_not_modules %if %build_core_not_modules
%makeinstall # Build the basic directory structure for the modules so we can
rm %{buildroot}%{_libdir}/*.la # own the directories in the main library package
install -d %{buildroot}%{_libexecdir}/libproxy
install -d %{buildroot}%{_libdir}/%{name}/%{version}/modules
%else %else
cd src/lib
%makeinstall
cd ../modules
%makeinstall
# remove files that are part of the core # remove files that are part of the core
rm %{buildroot}%{_includedir}/*.h rm %{buildroot}%{_includedir}/*.h
rm %{buildroot}%{_libdir}/libproxy.* # Delete all files that exist in the base libproxy package
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_envvar.so rm %{buildroot}%{_bindir}/proxy
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_file.so rm %{buildroot}%{_libdir}/libproxy.so*
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_direct.so rm %{buildroot}%{_libdir}/libmodman.so*
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/ignore_*.so rm %{buildroot}%{python_sitelib}/*.py
rm %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc
%endif %endif
%if %build_core_not_modules %if %build_core_not_modules
%post -n libproxy0 -p /sbin/ldconfig %post -n libproxy1 -p /sbin/ldconfig
%postun -n libproxy0 -p /sbin/ldconfig %post -n libmodman0_0_0 -p /sbin/ldconfig
%postun -n libproxy1 -p /sbin/ldconfig
%postun -n libmodman0_0_0 -p /sbin/ldconfig
%files tools %files tools
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/proxy %{_bindir}/proxy
%files -n libproxy0 %files -n libproxy1
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/*.so.* %{_libdir}/libproxy.so.*
%dir %{_libexecdir}/libproxy
%dir %{_libdir}/libproxy %dir %{_libdir}/libproxy
%dir %{_libdir}/libproxy/%{version} %dir %{_libdir}/libproxy/%{version}
%dir %{_libdir}/libproxy/%{version}/modules %dir %{_libdir}/libproxy/%{version}/modules
%{_libdir}/libproxy/%{version}/modules/config_envvar.so #%{_libdir}/libproxy/%{version}/modules/config_envvar.so
%{_libdir}/libproxy/%{version}/modules/config_file.so #%{_libdir}/libproxy/%{version}/modules/config_file.so
%{_libdir}/libproxy/%{version}/modules/config_direct.so #%{_libdir}/libproxy/%{version}/modules/config_direct.so
%{_libdir}/libproxy/%{version}/modules/ignore_*.so #%{_libdir}/libproxy/%{version}/modules/ignore_*.so
%files -n libmodman0_0_0
%defattr(-, root, root)
%{_libdir}/libmodman.so.*
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%{_includedir}/*.h %{_includedir}/*.h
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/libproxy-1.0.pc
%files -n python-libproxy %files -n python-libproxy
%defattr(-, root, root) %defattr(-, root, root)
%{python_sitelib}/*.py %{python_sitelib}/*.py
%else %else
%files -n libproxy0-config-kde4 %files -n libproxy1-config-kde4
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_kde4.so %{_libdir}/libproxy/%{version}/modules/config_kde4.so
%files -n libproxy0-config-gnome %files -n libproxy1-config-gnome
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_gnome.so %{_libdir}/libproxy/%{version}/modules/config_gnome.so
%{_libexecdir}/libproxy/pxgconf
%files -n libproxy0-config-wpad %files -n libproxy1-networkmanager
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_wpad.so
%files -n libproxy0-wpad-dns
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/wpad_dns.so
%files -n libproxy0-wpad-dns-devolution
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/wpad_dnsdevolution.so
%files -n libproxy0-networkmanager
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so %{_libdir}/libproxy/%{version}/modules/network_networkmanager.so
%files -n libproxy0-pacrunner-webkit %files -n libproxy1-pacrunner-webkit
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so %{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so
%files -n libproxy0-pacrunner-mozjs %files -n libproxy1-pacrunner-mozjs
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so %{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so
%endif %endif

13
libproxy-pysitelib.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libproxy-0.4.0/bindings/CMakeLists.txt
===================================================================
--- libproxy-0.4.0.orig/bindings/CMakeLists.txt
+++ libproxy-0.4.0/bindings/CMakeLists.txt
@@ -3,7 +3,7 @@ find_package(PythonInterp)
if(PYTHONINTERP_FOUND)
execute_process(COMMAND
${PYTHON_EXECUTABLE}
- -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=1)"
+ -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=0)"
OUTPUT_VARIABLE pysitepkgdir
OUTPUT_STRIP_TRAILING_WHITESPACE)
install(FILES libproxy.py DESTINATION ${pysitepkgdir})

31
libproxy.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Feb 26 09:44:18 CET 2010 - dimstar@opensuse.org
- Update to version 0.4.0:
+ C++ rewrite
+ Small API change (px_proxy_factory_get_proxy() can now return
NULL)
+ SOVERSION bump
+ libmodman is now a separate library
+ Migrate to cmake
+ Windows support (config_w32reg, ignore_hostname; VC++ support)
+ MacOSX support (config_macosx, ignore_hostname)
+ Built-in modules support
+ Support for chunked encoding
+ Move to hidden visibility by default
+ KDE's KConfig semantics are fully supported
+ Removeal of all PX_* env variables (no longer needed)
+ Symbol based detection of relevant pacrunner
+ Reworked config_gnome to not suck (its *much* faster)
+ Many other things I can't remember
- BuildRequire cmake, gccc-++ and zlib-devel
- Add libproxy-pysitelib.patch, as the python bindings are are
arch-independent
- Add libproxy-libexecpatch.patch to move library helpers to proper
libexecdir.
- Build the python-package as noarch
- sonum bump to 1, thus changing name to libproxy1
- Split out libmodman (will not follow the versioning of libproxy
in the long run).
- Add libproxy-pkgconfig.patch to also install the .pc file.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 5 17:17:30 CET 2010 - jengelh@medozas.de Tue Jan 5 17:17:30 CET 2010 - jengelh@medozas.de

244
libproxy.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package libproxy (Version 0.3.1) # spec file for package libproxy (Version 0.4.0)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -33,28 +33,38 @@ Url: http://code.google.com/p/libproxy/
Name: libproxy Name: libproxy
Group: System/Libraries Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to applications Summary: Libproxy provides consistent proxy configuration to applications
Version: 0.3.1 Version: 0.4.0
Release: 2 Release: 1
Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-pysitelib.patch dimstar@opensuse.org -- The bindings are arch-independent to be installed
Patch0: libproxy-pysitelib.patch
# PATCH-FIX-UPSTREAM libproxy-libexecpatch.patch dimstar@opensuse.org -- Use proper libexecdir
Patch1: libproxy-libexecpath.patch
# PATCH-FIX-UPSTREAM libproxy-pkgconfig.patch dimstar@opensuse.org -- Install pkgconfig files, taken from upstream svn.
Patch2: libproxy-pkgconfig.patch
License: LGPLv2.1+ License: LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: python-devel BuildRequires: zlib-devel
%if !%build_core_not_modules %if !%build_core_not_modules
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
BuildRequires: gconf2-devel BuildRequires: gconf2-devel
# For directory ownership, but also because we want to rebuild the modules if # For directory ownership, but also because we want to rebuild the modules if
# the library changed # the library changed
BuildRequires: libproxy0 BuildRequires: libproxy1
BuildRequires: gcc-c++
BuildRequires: libwebkit-devel BuildRequires: libwebkit-devel
BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
BuildRequires: xorg-x11-libXmu-devel BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libkde4-devel BuildRequires: libkde4-devel
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
%else
BuildRequires: python-devel
%endif %endif
%if %suse_version <= 1110 %if %suse_version <= 1110
%define python_sitelib %{py_sitedir} %define python_sitelib %{py_sitedir}
%endif %endif
@ -79,7 +89,8 @@ libproxy offers the following features: * extremely small core
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: A simple application using libproxy Summary: A simple application using libproxy
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Requires: libmodman0 = %{version}
%description tools %description tools
A simple application that will use libproxy to give the results you can A simple application that will use libproxy to give the results you can
@ -91,7 +102,7 @@ happen in various cases.
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications - Development Files Summary: Libproxy provides consistent proxy configuration to applications - Development Files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
%description devel %description devel
libproxy offers the following features: * extremely small core libproxy offers the following features: * extremely small core
@ -107,12 +118,12 @@ libproxy offers the following features: * extremely small core
* a standard way of dealing with proxy settings across all scenarios * a standard way of dealing with proxy settings across all scenarios
%package -n libproxy0 %package -n libproxy1
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications Summary: Libproxy provides consistent proxy configuration to applications
Group: System/Libraries Group: System/Libraries
%description -n libproxy0 %description -n libproxy1
libproxy offers the following features: * extremely small core libproxy offers the following features: * extremely small core
footprint (< 35K) footprint (< 35K)
@ -125,12 +136,23 @@ libproxy offers the following features: * extremely small core
* a standard way of dealing with proxy settings across all scenarios * a standard way of dealing with proxy settings across all scenarios
%package -n libmodman0_0_0
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy's Module Management Library
Group: System/Libraries
%description -n libmodman0_0_0
A module management library taking care of loading / unload modules
including heuristics in detecting which bindings might already
be used by an application and favouring this one.
%package -n python-libproxy %package -n python-libproxy
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Python bindings for libproxy Summary: Python bindings for libproxy
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} BuildArch: noarch
Requires: libproxy1 = %{version}
%py_requires %py_requires
%description -n python-libproxy %description -n python-libproxy
@ -151,7 +173,7 @@ libproxy offers the following features: * extremely small core
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: .Net bindings for libproxy Summary: .Net bindings for libproxy
Group: Development/Languages/Mono Group: Development/Languages/Mono
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
%description -n libproxy-sharp %description -n libproxy-sharp
libproxy offers the following features: * extremely small core libproxy offers the following features: * extremely small core
@ -169,230 +191,170 @@ libproxy offers the following features: * extremely small core
%else %else
%package -n libproxy0-config-gnome %package -n libproxy1-config-gnome
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for GNOME configuration Summary: Libproxy module for GNOME configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Recommends: libproxy0-pacrunner = %{version} Recommends: libproxy1-pacrunner = %{version}
Recommends: libproxy0-wpad-dns = %{version} Recommends: libproxy1-wpad-dns = %{version}
Supplements: packageand(libproxy0:gconf2) Supplements: packageand(libproxy1:gconf2)
Provides: libproxy-gnome = %{version} Provides: libproxy-gnome = %{version}
Obsoletes: libproxy-gnome < %{version} Obsoletes: libproxy-gnome < %{version}
Provides: libproxy0-gnome = %{version}
Obsoletes: libproxy0-gnome < %{version}
%description -n libproxy0-config-gnome %description -n libproxy1-config-gnome
A module to extend libproxy with capabilities to query GNOME about A module to extend libproxy with capabilities to query GNOME about
proxy settings. proxy settings.
%package -n libproxy0-config-kde4 %package -n libproxy1-config-kde4
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for KDE configuration Summary: Libproxy module for KDE configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Recommends: libproxy0-pacrunner = %{version} Recommends: libproxy1-pacrunner = %{version}
Recommends: libproxy0-wpad-dns = %{version} Recommends: libproxy1-wpad-dns = %{version}
Supplements: packageand(libproxy0:libkde4) Supplements: packageand(libproxy1:libkde4)
Provides: libproxy-kde = %{version} Provides: libproxy-kde = %{version}
Obsoletes: libproxy-kde < %{version} Obsoletes: libproxy-kde < %{version}
Provides: libproxy0-kde = %{version}
Obsoletes: libproxy0-kde < %{version}
Obsoletes: libproxy0-config-kde <= %{version}
%description -n libproxy0-config-kde4 %description -n libproxy1-config-kde4
A module to extend libproxy with capabilities to query KDE4 about proxy A module to extend libproxy with capabilities to query KDE4 about proxy
settings. settings.
%package -n libproxy0-pacrunner-mozjs %package -n libproxy1-pacrunner-mozjs
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Supplements: packageand(libproxy0:mozilla-xulrunner%{xulrunner_ver}) Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver})
# A virtual symbol to identify that this is a pacrunner. # A virtual symbol to identify that this is a pacrunner.
Provides: libproxy0-pacrunner = %{version} Provides: libproxy1-pacrunner = %{version}
Provides: libproxy-mozjs = %{version}
Obsoletes: libproxy-mozjs < %{version}
Provides: libproxy0-mozjs = %{version}
Obsoletes: libproxy0-mozjs < %{version}
%description -n libproxy0-pacrunner-mozjs %description -n libproxy1-pacrunner-mozjs
A module to extend libproxy with capabilities to pass addresses to a A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy. WPAD/PAC script and have it find the correct proxy.
%package -n libproxy0-pacrunner-webkit %package -n libproxy1-pacrunner-webkit
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Supplements: packageand(libproxy0:libwebkit-1) Supplements: packageand(libproxy1:libwebkit-1)
# A virtual symbol to identify that this is a pacrunner. # A virtual symbol to identify that this is a pacrunner.
Provides: libproxy0-pacrunner = %{version} Provides: libproxy1-pacrunner = %{version}
Provides: libproxy-webkit = %{version}
Obsoletes: libproxy-webkit < %{version}
Provides: libproxy0-webkit = %{version}
Obsoletes: libproxy0-webkit < %{version}
%description -n libproxy0-pacrunner-webkit %description -n libproxy1-pacrunner-webkit
A module to extend libproxy with capabilities to pass addresses to a A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy. WPAD/PAC script and have it find the correct proxy.
%package -n libproxy0-networkmanager %package -n libproxy1-networkmanager
License: GPLv2+ ; LGPLv2.1+ License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for NetworkManager configuration Summary: Libproxy module for NetworkManager configuration
Group: System/Libraries Group: System/Libraries
Requires: libproxy0 = %{version} Requires: libproxy1 = %{version}
Supplements: packageand(libproxy0:NetworkManager) Supplements: packageand(libproxy1:NetworkManager)
Provides: libproxy-networkmanager = %{version}
Obsoletes: libproxy-networkmanager < %{version}
%description -n libproxy0-networkmanager %description -n libproxy1-networkmanager
A module to extend libproxy with capabilities to query NetworkManager A module to extend libproxy with capabilities to query NetworkManager
about network configuration changes. about network configuration changes.
%package -n libproxy0-config-wpad
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for WPAD autofallback
Group: System/Libraries
Requires: libproxy0 = %{version}
Requires: libproxy0-wpad-dns = %{version}
%description -n libproxy0-config-wpad
A module to extend libproxy with capabilities to query wpad://
in case no other module returns valid configuration.
This might not be wanted in tight security environments.
%package -n libproxy0-wpad-dns
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for WPAD Autofallback
Group: System/Libraries
Requires: libproxy0 = %{version}
Requires: libproxy0-pacrunner = %{version}
Recommends: libproxy-wpad-dns-devolution = %{version}
%description -n libproxy0-wpad-dns
This modules performs the DNS queries needed to find the wpad://
configuration.
The module is needed whenever automatic proxy configuration is used.
%package -n libproxy0-wpad-dns-devolution
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for WPAD Autofallback
Group: System/Libraries
Requires: libproxy0 = %{version}
Requires: libproxy0-pacrunner = %{version}
Requires: libproxy0-wpad-dns = %{version}
%description -n libproxy0-wpad-dns-devolution
A module to extend wpad:// capabilities of libproxy with DNS
devolution.
The module is written with care and it will never fall back to the
.TLD domains.
%endif %endif
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build %build
%configure \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
%if %build_core_not_modules %ifarch x86_64
--without-wpad \ -DLIB_SUFFIX=64 \
%endif %endif
--with-python \ .
--disable-static # THAT DOT BELONGS TO THE CMAKE CALL
%{__make} %{?jobs:-j%jobs} %{__make} %{?jobs:-j%jobs}
%install %install
%makeinstall
%if %build_core_not_modules %if %build_core_not_modules
%makeinstall # Build the basic directory structure for the modules so we can
rm %{buildroot}%{_libdir}/*.la # own the directories in the main library package
install -d %{buildroot}%{_libexecdir}/libproxy
install -d %{buildroot}%{_libdir}/%{name}/%{version}/modules
%else %else
cd src/lib
%makeinstall
cd ../modules
%makeinstall
# remove files that are part of the core # remove files that are part of the core
rm %{buildroot}%{_includedir}/*.h rm %{buildroot}%{_includedir}/*.h
rm %{buildroot}%{_libdir}/libproxy.* # Delete all files that exist in the base libproxy package
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_envvar.so rm %{buildroot}%{_bindir}/proxy
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_file.so rm %{buildroot}%{_libdir}/libproxy.so*
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_direct.so rm %{buildroot}%{_libdir}/libmodman.so*
rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/ignore_*.so rm %{buildroot}%{python_sitelib}/*.py
rm %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc
%endif %endif
%if %build_core_not_modules %if %build_core_not_modules
%post -n libproxy0 -p /sbin/ldconfig %post -n libproxy1 -p /sbin/ldconfig
%postun -n libproxy0 -p /sbin/ldconfig %post -n libmodman0_0_0 -p /sbin/ldconfig
%postun -n libproxy1 -p /sbin/ldconfig
%postun -n libmodman0_0_0 -p /sbin/ldconfig
%files tools %files tools
%defattr(-, root, root) %defattr(-, root, root)
%{_bindir}/proxy %{_bindir}/proxy
%files -n libproxy0 %files -n libproxy1
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/*.so.* %{_libdir}/libproxy.so.*
%dir %{_libexecdir}/libproxy
%dir %{_libdir}/libproxy %dir %{_libdir}/libproxy
%dir %{_libdir}/libproxy/%{version} %dir %{_libdir}/libproxy/%{version}
%dir %{_libdir}/libproxy/%{version}/modules %dir %{_libdir}/libproxy/%{version}/modules
%{_libdir}/libproxy/%{version}/modules/config_envvar.so #%{_libdir}/libproxy/%{version}/modules/config_envvar.so
%{_libdir}/libproxy/%{version}/modules/config_file.so #%{_libdir}/libproxy/%{version}/modules/config_file.so
%{_libdir}/libproxy/%{version}/modules/config_direct.so #%{_libdir}/libproxy/%{version}/modules/config_direct.so
%{_libdir}/libproxy/%{version}/modules/ignore_*.so #%{_libdir}/libproxy/%{version}/modules/ignore_*.so
%files -n libmodman0_0_0
%defattr(-, root, root)
%{_libdir}/libmodman.so.*
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%{_includedir}/*.h %{_includedir}/*.h
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/libproxy-1.0.pc
%files -n python-libproxy %files -n python-libproxy
%defattr(-, root, root) %defattr(-, root, root)
%{python_sitelib}/*.py %{python_sitelib}/*.py
%else %else
%files -n libproxy0-config-kde4 %files -n libproxy1-config-kde4
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_kde4.so %{_libdir}/libproxy/%{version}/modules/config_kde4.so
%files -n libproxy0-config-gnome %files -n libproxy1-config-gnome
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_gnome.so %{_libdir}/libproxy/%{version}/modules/config_gnome.so
%{_libexecdir}/libproxy/pxgconf
%files -n libproxy0-config-wpad %files -n libproxy1-networkmanager
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_wpad.so
%files -n libproxy0-wpad-dns
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/wpad_dns.so
%files -n libproxy0-wpad-dns-devolution
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/wpad_dnsdevolution.so
%files -n libproxy0-networkmanager
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so %{_libdir}/libproxy/%{version}/modules/network_networkmanager.so
%files -n libproxy0-pacrunner-webkit %files -n libproxy1-pacrunner-webkit
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so %{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so
%files -n libproxy0-pacrunner-mozjs %files -n libproxy1-pacrunner-mozjs
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so %{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so
%endif %endif