Mailinglist Archive: opensuse-commit (1093 mails)
| < Previous | Next > |
commit libproxy for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 05 Mar 2010 02:14:24 +0100
- Message-id: <20100305011424.9948E2029A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package libproxy for openSUSE:Factory
checked in at Fri Mar 5 02:14:24 CET 2010.
--------
--- GNOME/libproxy/libproxy-plugins.changes 2010-01-21 11:12:16.000000000
+0100
+++ /mounts/work_src_done/STABLE/libproxy/libproxy-plugins.changes
2010-03-05 02:13:36.597691000 +0100
@@ -1,0 +2,31 @@
+Fri Feb 26 09:44:18 CET 2010 - dimstar@xxxxxxxxxxxx
+
+- 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.
+
+-------------------------------------------------------------------
libproxy.changes: same change
calling whatdependson for head-i586
Old:
----
libproxy-0.3.1.tar.bz2
New:
----
libproxy-0.4.0.tar.bz2
libproxy-libexecpath.patch
libproxy-pkgconfig.patch
libproxy-pysitelib.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libproxy-plugins.spec ++++++
--- /var/tmp/diff_new_pack.XXjH9F/_old 2010-03-05 02:13:50.000000000 +0100
+++ /var/tmp/diff_new_pack.XXjH9F/_new 2010-03-05 02:13:50.000000000 +0100
@@ -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.
#
@@ -33,28 +33,38 @@
Name: libproxy-plugins
Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to
applications
-Version: 0.3.1
-Release: 2
+Version: 0.4.0
+Release: 1
Source:
http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM libproxy-pysitelib.patch dimstar@xxxxxxxxxxxx -- The
bindings are arch-independent to be installed
+Patch0: libproxy-pysitelib.patch
+# PATCH-FIX-UPSTREAM libproxy-libexecpatch.patch dimstar@xxxxxxxxxxxx -- Use
proper libexecdir
+Patch1: libproxy-libexecpath.patch
+# PATCH-FIX-UPSTREAM libproxy-pkgconfig.patch dimstar@xxxxxxxxxxxx -- Install
pkgconfig files, taken from upstream svn.
+Patch2: libproxy-pkgconfig.patch
License: LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: cmake
+BuildRequires: gcc-c++
BuildRequires: pkg-config
-BuildRequires: python-devel
+BuildRequires: zlib-devel
%if !%build_core_not_modules
BuildRequires: dbus-1-devel
BuildRequires: gconf2-devel
# For directory ownership, but also because we want to rebuild the modules if
# the library changed
-BuildRequires: libproxy0
-BuildRequires: gcc-c++
+BuildRequires: libproxy1
BuildRequires: libwebkit-devel
BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel
BuildRequires: NetworkManager-devel
BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libkde4-devel
BuildRequires: libqt4-devel
+%else
+BuildRequires: python-devel
%endif
+
%if %suse_version <= 1110
%define python_sitelib %{py_sitedir}
%endif
@@ -76,10 +86,11 @@
%if %build_core_not_modules
%package tools
-License: GPL v2 or later ; LGPL v2.1 or later
+License: GPLv2+ ; LGPLv2.1+
Summary: A simple application using libproxy
Group: System/Libraries
-Requires: libproxy0 = %{version}
+Requires: libproxy1 = %{version}
+Requires: libmodman0 = %{version}
%description tools
A simple application that will use libproxy to give the results you can
@@ -88,10 +99,10 @@
%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
Group: Development/Libraries/C and C++
-Requires: libproxy0 = %{version}
+Requires: libproxy1 = %{version}
%description devel
libproxy offers the following features: * extremely small core
@@ -107,12 +118,12 @@
* a standard way of dealing with proxy settings across all scenarios
-%package -n libproxy0
+%package -n libproxy1
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to
applications
Group: System/Libraries
-%description -n libproxy0
+%description -n libproxy1
libproxy offers the following features: * extremely small core
footprint (< 35K)
@@ -125,12 +136,23 @@
* 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
License: GPLv2+ ; LGPLv2.1+
Summary: Python bindings for libproxy
Group: System/Libraries
-Requires: libproxy0 = %{version}
+BuildArch: noarch
+Requires: libproxy1 = %{version}
%py_requires
%description -n python-libproxy
@@ -151,7 +173,7 @@
License: GPLv2+ ; LGPLv2.1+
Summary: .Net bindings for libproxy
Group: Development/Languages/Mono
-Requires: libproxy0 = %{version}
+Requires: libproxy1 = %{version}
%description -n libproxy-sharp
libproxy offers the following features: * extremely small core
@@ -169,230 +191,170 @@
%else
-%package -n libproxy0-config-gnome
+%package -n libproxy1-config-gnome
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for GNOME configuration
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Recommends: libproxy0-pacrunner = %{version}
-Recommends: libproxy0-wpad-dns = %{version}
-Supplements: packageand(libproxy0:gconf2)
+Requires: libproxy1 = %{version}
+Recommends: libproxy1-pacrunner = %{version}
+Recommends: libproxy1-wpad-dns = %{version}
+Supplements: packageand(libproxy1:gconf2)
Provides: 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
proxy settings.
-%package -n libproxy0-config-kde4
+%package -n libproxy1-config-kde4
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for KDE configuration
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Recommends: libproxy0-pacrunner = %{version}
-Recommends: libproxy0-wpad-dns = %{version}
-Supplements: packageand(libproxy0:libkde4)
+Requires: libproxy1 = %{version}
+Recommends: libproxy1-pacrunner = %{version}
+Recommends: libproxy1-wpad-dns = %{version}
+Supplements: packageand(libproxy1:libkde4)
Provides: 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
settings.
-%package -n libproxy0-pacrunner-mozjs
+%package -n libproxy1-pacrunner-mozjs
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support wpad/pac parsing via Mozilla
JavaScript Engine
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Supplements: packageand(libproxy0:mozilla-xulrunner%{xulrunner_ver})
+Requires: libproxy1 = %{version}
+Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver})
# A virtual symbol to identify that this is a pacrunner.
-Provides: libproxy0-pacrunner = %{version}
-Provides: libproxy-mozjs = %{version}
-Obsoletes: libproxy-mozjs < %{version}
-Provides: libproxy0-mozjs = %{version}
-Obsoletes: libproxy0-mozjs < %{version}
+Provides: libproxy1-pacrunner = %{version}
-%description -n libproxy0-pacrunner-mozjs
+%description -n libproxy1-pacrunner-mozjs
A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy.
-%package -n libproxy0-pacrunner-webkit
+%package -n libproxy1-pacrunner-webkit
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support WPAD/PAC parsing via WebKit
JavaScript Engine
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Supplements: packageand(libproxy0:libwebkit-1)
+Requires: libproxy1 = %{version}
+Supplements: packageand(libproxy1:libwebkit-1)
# A virtual symbol to identify that this is a pacrunner.
-Provides: libproxy0-pacrunner = %{version}
-Provides: libproxy-webkit = %{version}
-Obsoletes: libproxy-webkit < %{version}
-Provides: libproxy0-webkit = %{version}
-Obsoletes: libproxy0-webkit < %{version}
+Provides: libproxy1-pacrunner = %{version}
-%description -n libproxy0-pacrunner-webkit
+%description -n libproxy1-pacrunner-webkit
A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy.
-%package -n libproxy0-networkmanager
+%package -n libproxy1-networkmanager
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for NetworkManager configuration
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Supplements: packageand(libproxy0:NetworkManager)
-Provides: libproxy-networkmanager = %{version}
-Obsoletes: libproxy-networkmanager < %{version}
+Requires: libproxy1 = %{version}
+Supplements: packageand(libproxy1:NetworkManager)
-%description -n libproxy0-networkmanager
+%description -n libproxy1-networkmanager
A module to extend libproxy with capabilities to query NetworkManager
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
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
-%configure \
-%if %build_core_not_modules
- --without-wpad \
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%ifarch x86_64
+-DLIB_SUFFIX=64 \
%endif
- --with-python \
- --disable-static
+.
+# THAT DOT BELONGS TO THE CMAKE CALL
%{__make} %{?jobs:-j%jobs}
%install
-%if %build_core_not_modules
%makeinstall
-rm %{buildroot}%{_libdir}/*.la
+%if %build_core_not_modules
+# Build the basic directory structure for the modules so we can
+# own the directories in the main library package
+install -d %{buildroot}%{_libexecdir}/libproxy
+install -d %{buildroot}%{_libdir}/%{name}/%{version}/modules
%else
-cd src/lib
-%makeinstall
-cd ../modules
-%makeinstall
# remove files that are part of the core
rm %{buildroot}%{_includedir}/*.h
-rm %{buildroot}%{_libdir}/libproxy.*
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_envvar.so
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_file.so
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_direct.so
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/ignore_*.so
+# Delete all files that exist in the base libproxy package
+rm %{buildroot}%{_bindir}/proxy
+rm %{buildroot}%{_libdir}/libproxy.so*
+rm %{buildroot}%{_libdir}/libmodman.so*
+rm %{buildroot}%{python_sitelib}/*.py
+rm %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc
%endif
%if %build_core_not_modules
-%post -n libproxy0 -p /sbin/ldconfig
+%post -n libproxy1 -p /sbin/ldconfig
+
+%post -n libmodman0_0_0 -p /sbin/ldconfig
+
+%postun -n libproxy1 -p /sbin/ldconfig
-%postun -n libproxy0 -p /sbin/ldconfig
+%postun -n libmodman0_0_0 -p /sbin/ldconfig
%files tools
%defattr(-, root, root)
%{_bindir}/proxy
-%files -n libproxy0
+%files -n libproxy1
%defattr(-, root, root)
-%{_libdir}/*.so.*
+%{_libdir}/libproxy.so.*
+%dir %{_libexecdir}/libproxy
%dir %{_libdir}/libproxy
%dir %{_libdir}/libproxy/%{version}
%dir %{_libdir}/libproxy/%{version}/modules
-%{_libdir}/libproxy/%{version}/modules/config_envvar.so
-%{_libdir}/libproxy/%{version}/modules/config_file.so
-%{_libdir}/libproxy/%{version}/modules/config_direct.so
-%{_libdir}/libproxy/%{version}/modules/ignore_*.so
+#%{_libdir}/libproxy/%{version}/modules/config_envvar.so
+#%{_libdir}/libproxy/%{version}/modules/config_file.so
+#%{_libdir}/libproxy/%{version}/modules/config_direct.so
+#%{_libdir}/libproxy/%{version}/modules/ignore_*.so
+
+%files -n libmodman0_0_0
+%defattr(-, root, root)
+%{_libdir}/libmodman.so.*
%files devel
%defattr(-, root, root)
%{_includedir}/*.h
%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/libproxy-1.0.pc
%files -n python-libproxy
%defattr(-, root, root)
%{python_sitelib}/*.py
%else
-%files -n libproxy0-config-kde4
+%files -n libproxy1-config-kde4
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_kde4.so
-%files -n libproxy0-config-gnome
+%files -n libproxy1-config-gnome
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_gnome.so
+%{_libexecdir}/libproxy/pxgconf
-%files -n libproxy0-config-wpad
-%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
+%files -n libproxy1-networkmanager
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so
-%files -n libproxy0-pacrunner-webkit
+%files -n libproxy1-pacrunner-webkit
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so
-%files -n libproxy0-pacrunner-mozjs
+%files -n libproxy1-pacrunner-mozjs
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so
%endif
++++++ libproxy.spec ++++++
--- /var/tmp/diff_new_pack.XXjH9F/_old 2010-03-05 02:13:50.000000000 +0100
+++ /var/tmp/diff_new_pack.XXjH9F/_new 2010-03-05 02:13:50.000000000 +0100
@@ -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.
#
@@ -33,28 +33,38 @@
Name: libproxy
Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to
applications
-Version: 0.3.1
-Release: 2
+Version: 0.4.0
+Release: 1
Source:
http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM libproxy-pysitelib.patch dimstar@xxxxxxxxxxxx -- The
bindings are arch-independent to be installed
+Patch0: libproxy-pysitelib.patch
+# PATCH-FIX-UPSTREAM libproxy-libexecpatch.patch dimstar@xxxxxxxxxxxx -- Use
proper libexecdir
+Patch1: libproxy-libexecpath.patch
+# PATCH-FIX-UPSTREAM libproxy-pkgconfig.patch dimstar@xxxxxxxxxxxx -- Install
pkgconfig files, taken from upstream svn.
+Patch2: libproxy-pkgconfig.patch
License: LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: cmake
+BuildRequires: gcc-c++
BuildRequires: pkg-config
-BuildRequires: python-devel
+BuildRequires: zlib-devel
%if !%build_core_not_modules
BuildRequires: dbus-1-devel
BuildRequires: gconf2-devel
# For directory ownership, but also because we want to rebuild the modules if
# the library changed
-BuildRequires: libproxy0
-BuildRequires: gcc-c++
+BuildRequires: libproxy1
BuildRequires: libwebkit-devel
BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel
BuildRequires: NetworkManager-devel
BuildRequires: xorg-x11-libXmu-devel
BuildRequires: libkde4-devel
BuildRequires: libqt4-devel
+%else
+BuildRequires: python-devel
%endif
+
%if %suse_version <= 1110
%define python_sitelib %{py_sitedir}
%endif
@@ -79,7 +89,8 @@
License: GPLv2+ ; LGPLv2.1+
Summary: A simple application using libproxy
Group: System/Libraries
-Requires: libproxy0 = %{version}
+Requires: libproxy1 = %{version}
+Requires: libmodman0 = %{version}
%description tools
A simple application that will use libproxy to give the results you can
@@ -91,7 +102,7 @@
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to
applications - Development Files
Group: Development/Libraries/C and C++
-Requires: libproxy0 = %{version}
+Requires: libproxy1 = %{version}
%description devel
libproxy offers the following features: * extremely small core
@@ -107,12 +118,12 @@
* a standard way of dealing with proxy settings across all scenarios
-%package -n libproxy0
+%package -n libproxy1
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to
applications
Group: System/Libraries
-%description -n libproxy0
+%description -n libproxy1
libproxy offers the following features: * extremely small core
footprint (< 35K)
@@ -125,12 +136,23 @@
* 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
License: GPLv2+ ; LGPLv2.1+
Summary: Python bindings for libproxy
Group: System/Libraries
-Requires: libproxy0 = %{version}
+BuildArch: noarch
+Requires: libproxy1 = %{version}
%py_requires
%description -n python-libproxy
@@ -151,7 +173,7 @@
License: GPLv2+ ; LGPLv2.1+
Summary: .Net bindings for libproxy
Group: Development/Languages/Mono
-Requires: libproxy0 = %{version}
+Requires: libproxy1 = %{version}
%description -n libproxy-sharp
libproxy offers the following features: * extremely small core
@@ -169,230 +191,170 @@
%else
-%package -n libproxy0-config-gnome
+%package -n libproxy1-config-gnome
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for GNOME configuration
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Recommends: libproxy0-pacrunner = %{version}
-Recommends: libproxy0-wpad-dns = %{version}
-Supplements: packageand(libproxy0:gconf2)
+Requires: libproxy1 = %{version}
+Recommends: libproxy1-pacrunner = %{version}
+Recommends: libproxy1-wpad-dns = %{version}
+Supplements: packageand(libproxy1:gconf2)
Provides: 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
proxy settings.
-%package -n libproxy0-config-kde4
+%package -n libproxy1-config-kde4
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for KDE configuration
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Recommends: libproxy0-pacrunner = %{version}
-Recommends: libproxy0-wpad-dns = %{version}
-Supplements: packageand(libproxy0:libkde4)
+Requires: libproxy1 = %{version}
+Recommends: libproxy1-pacrunner = %{version}
+Recommends: libproxy1-wpad-dns = %{version}
+Supplements: packageand(libproxy1:libkde4)
Provides: 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
settings.
-%package -n libproxy0-pacrunner-mozjs
+%package -n libproxy1-pacrunner-mozjs
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support wpad/pac parsing via Mozilla
JavaScript Engine
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Supplements: packageand(libproxy0:mozilla-xulrunner%{xulrunner_ver})
+Requires: libproxy1 = %{version}
+Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver})
# A virtual symbol to identify that this is a pacrunner.
-Provides: libproxy0-pacrunner = %{version}
-Provides: libproxy-mozjs = %{version}
-Obsoletes: libproxy-mozjs < %{version}
-Provides: libproxy0-mozjs = %{version}
-Obsoletes: libproxy0-mozjs < %{version}
+Provides: libproxy1-pacrunner = %{version}
-%description -n libproxy0-pacrunner-mozjs
+%description -n libproxy1-pacrunner-mozjs
A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy.
-%package -n libproxy0-pacrunner-webkit
+%package -n libproxy1-pacrunner-webkit
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support WPAD/PAC parsing via WebKit
JavaScript Engine
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Supplements: packageand(libproxy0:libwebkit-1)
+Requires: libproxy1 = %{version}
+Supplements: packageand(libproxy1:libwebkit-1)
# A virtual symbol to identify that this is a pacrunner.
-Provides: libproxy0-pacrunner = %{version}
-Provides: libproxy-webkit = %{version}
-Obsoletes: libproxy-webkit < %{version}
-Provides: libproxy0-webkit = %{version}
-Obsoletes: libproxy0-webkit < %{version}
+Provides: libproxy1-pacrunner = %{version}
-%description -n libproxy0-pacrunner-webkit
+%description -n libproxy1-pacrunner-webkit
A module to extend libproxy with capabilities to pass addresses to a
WPAD/PAC script and have it find the correct proxy.
-%package -n libproxy0-networkmanager
+%package -n libproxy1-networkmanager
License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for NetworkManager configuration
Group: System/Libraries
-Requires: libproxy0 = %{version}
-Supplements: packageand(libproxy0:NetworkManager)
-Provides: libproxy-networkmanager = %{version}
-Obsoletes: libproxy-networkmanager < %{version}
+Requires: libproxy1 = %{version}
+Supplements: packageand(libproxy1:NetworkManager)
-%description -n libproxy0-networkmanager
+%description -n libproxy1-networkmanager
A module to extend libproxy with capabilities to query NetworkManager
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
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
-%configure \
-%if %build_core_not_modules
- --without-wpad \
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%ifarch x86_64
+-DLIB_SUFFIX=64 \
%endif
- --with-python \
- --disable-static
+.
+# THAT DOT BELONGS TO THE CMAKE CALL
%{__make} %{?jobs:-j%jobs}
%install
-%if %build_core_not_modules
%makeinstall
-rm %{buildroot}%{_libdir}/*.la
+%if %build_core_not_modules
+# Build the basic directory structure for the modules so we can
+# own the directories in the main library package
+install -d %{buildroot}%{_libexecdir}/libproxy
+install -d %{buildroot}%{_libdir}/%{name}/%{version}/modules
%else
-cd src/lib
-%makeinstall
-cd ../modules
-%makeinstall
# remove files that are part of the core
rm %{buildroot}%{_includedir}/*.h
-rm %{buildroot}%{_libdir}/libproxy.*
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_envvar.so
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_file.so
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/config_direct.so
-rm %{buildroot}%{_libdir}/libproxy/%{version}/modules/ignore_*.so
+# Delete all files that exist in the base libproxy package
+rm %{buildroot}%{_bindir}/proxy
+rm %{buildroot}%{_libdir}/libproxy.so*
+rm %{buildroot}%{_libdir}/libmodman.so*
+rm %{buildroot}%{python_sitelib}/*.py
+rm %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc
%endif
%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
%defattr(-, root, root)
%{_bindir}/proxy
-%files -n libproxy0
+%files -n libproxy1
%defattr(-, root, root)
-%{_libdir}/*.so.*
+%{_libdir}/libproxy.so.*
+%dir %{_libexecdir}/libproxy
%dir %{_libdir}/libproxy
%dir %{_libdir}/libproxy/%{version}
%dir %{_libdir}/libproxy/%{version}/modules
-%{_libdir}/libproxy/%{version}/modules/config_envvar.so
-%{_libdir}/libproxy/%{version}/modules/config_file.so
-%{_libdir}/libproxy/%{version}/modules/config_direct.so
-%{_libdir}/libproxy/%{version}/modules/ignore_*.so
+#%{_libdir}/libproxy/%{version}/modules/config_envvar.so
+#%{_libdir}/libproxy/%{version}/modules/config_file.so
+#%{_libdir}/libproxy/%{version}/modules/config_direct.so
+#%{_libdir}/libproxy/%{version}/modules/ignore_*.so
+
+%files -n libmodman0_0_0
+%defattr(-, root, root)
+%{_libdir}/libmodman.so.*
%files devel
%defattr(-, root, root)
%{_includedir}/*.h
%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/libproxy-1.0.pc
%files -n python-libproxy
%defattr(-, root, root)
%{python_sitelib}/*.py
%else
-%files -n libproxy0-config-kde4
+%files -n libproxy1-config-kde4
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_kde4.so
-%files -n libproxy0-config-gnome
+%files -n libproxy1-config-gnome
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/config_gnome.so
+%{_libexecdir}/libproxy/pxgconf
-%files -n libproxy0-config-wpad
-%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
+%files -n libproxy1-networkmanager
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so
-%files -n libproxy0-pacrunner-webkit
+%files -n libproxy1-pacrunner-webkit
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so
-%files -n libproxy0-pacrunner-mozjs
+%files -n libproxy1-pacrunner-mozjs
%defattr(-, root, root)
%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so
%endif
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.XXjH9F/_old 2010-03-05 02:13:50.000000000 +0100
+++ /var/tmp/diff_new_pack.XXjH9F/_new 2010-03-05 02:13:50.000000000 +0100
@@ -1,12 +1,12 @@
-libproxy0
-libproxy0-config-gnome
- supplements "packageand(libproxy0-<targettype>:libproxy0-gnome)"
-libproxy0-config-kde
- supplements "packageand(libproxy0-<targettype>:libproxy0-kde)"
-libproxy0-pacrunner-mozjs
- supplements "packageand(libproxy0-<targettype>:libproxy0-mozjs)"
-libproxy0-networkmanager
- supplements "packageand(libproxy0-<targettype>:libproxy0-networkmanager)"
-libproxy0-pacrunner-webkit
- supplements "packageand(libproxy0-<targettype>:libproxy0-webkit)"
+libproxy1
+libproxy1-config-gnome
+ supplements "packageand(libproxy1-<targettype>:libproxy1-gnome)"
+libproxy1-config-kde
+ supplements "packageand(libproxy1-<targettype>:libproxy1-kde)"
+libproxy1-pacrunner-mozjs
+ supplements "packageand(libproxy1-<targettype>:libproxy1-mozjs)"
+libproxy1-networkmanager
+ supplements "packageand(libproxy1-<targettype>:libproxy1-networkmanager)"
+libproxy1-pacrunner-webkit
+ supplements "packageand(libproxy1-<targettype>:libproxy1-webkit)"
++++++ libproxy-0.3.1.tar.bz2 -> libproxy-0.4.0.tar.bz2 ++++++
++++ 64557 lines of diff (skipped)
++++++ libproxy-libexecpath.patch ++++++
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()
++++++ libproxy-pkgconfig.patch ++++++
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()
++++++ libproxy-pysitelib.patch ++++++
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})
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |