OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=7

baselibs.conf

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

libproxy-plugins.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jun 22 12:46:40 CEST 2009 - dominique-obs@leuenberger.net
+
+- Add libproxy-svn-303_as-needed.patch to successfully build with
+  --as-needed
+
+-------------------------------------------------------------------
+Tue Jun 16 13:39:41 CEST 2009 - dominique-obs@leuenberger.net
+
+- Extend baselibs.conf
+  We also need the plugins 32bit. The 32bit plugin get's installed
+  as soon as the 32bit librarz is installed. Same featureset is
+  recommended, bnc#485543
+
 -------------------------------------------------------------------
 Wed May 13 03:38:07 CEST 2009 - vuntz@novell.com
 

libproxy-plugins.spec

@@ -34,12 +34,14 @@ Name:           libproxy-plugins
 Group:          System/Libraries
 Summary:        libproxy is a library that provides automatic proxy configuration management
 Version:        0.2.3
-Release:        2
+Release:        3
 Source:         http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM libproxy-0.2.3-dbus.diff -- Taken from upstream svn
 Patch0:         libproxy-0.2.3-dbus.diff
 # PATCH-FIX-UPSTREAM libproxy-svn-277.patch -- Taken from upstream svn
 Patch1:         libproxy-svn-277.patch
+# PATCH-FIX-UPSTREAM libproxy-svn-303_as-needed.patch dominique-obs@leuenberger.net -- Taken from upstream svn
+Patch2:         libproxy-svn-303_as-needed.patch
 License:        LGPL v2.1 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkg-config
@@ -123,7 +125,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0          
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        libproxy is a library that provides automatic proxy configuration management
 Group:          System/Libraries
 
@@ -148,7 +150,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n python-libproxy
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Python bindings for libproxy
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -177,7 +179,7 @@ Authors:
 %else
 
 %package -n libproxy0-gnome
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin for GNOME configuration
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -197,7 +199,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-kde
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin for KDE configuration
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -217,7 +219,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-mozjs
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin to support wpad/pac parsing via Mozilla JavaScript Engine
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -237,7 +239,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-webkit
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin to support WPAD/PAC parsing via WebKit JavaScript Engine
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -257,7 +259,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-networkmanager
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin for NetworkManager configuration
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -282,6 +284,7 @@ Authors:
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2
 
 %build
 autoreconf -f -i
@@ -355,48 +358,3 @@ rm $RPM_BUILD_ROOT%{_libdir}/libproxy/%{version}/plugins/file.so
 %endif
 
 %changelog
-* Wed May 13 2009 vuntz@novell.com
-- Tag patches.
-* Wed May 06 2009 vuntz@novell.com
-- Build libproxy-plugins against mozilla-xulrunner191 on
-  openSUSE > 11.1.
-* Thu Apr 23 2009 vuntz@novell.com
-- Change Name to libproxy-plugins in libproxy-plugins.spec.
-* Thu Apr 16 2009 vuntz@novell.com
-- Split the build in two steps, libproxy and libproxy-plugins, to
-  avoid a build loop: libproxy depends on libwebkit which depends
-  on libsoup which depends on libproxy. So we now have a new spec
-  file for libproxy-plugins where the libwebkit dependency is.
-* Sun Mar 15 2009 vuntz@novell.com
-- Review changes.
-* Sat Mar 14 2009 wr@rosenauer.org
-- use correct mozilla/xulrunner dependencies
-* Mon Feb 23 2009 vuntz@novell.com
-- Revert the use of %%{libproxy_shnum}: there are places where the
-  macro cannot be used (%%files, eg), and we want don't want to mix
-  libproxy0 and libproxy%%{libproxy_shnum} -- too likely to forget
-  to update one of the two instances.
-* Sun Feb 22 2009 vuntz@novell.com
-- Review changes.
-- Add Provides/Obsoletes after plugin packages renaming.
-- Don't use %%{name} everywhere: in some places, it doesn't help
-  with clarity; in some others, it could be wrong in the future (in
-  Supplements).
-* Tue Feb 17 2009 domninique-obs@leuenberger.net
-- Replace the %%{name}0 all over by %%{name}%%{libproxy_shnum}, makes
-  it easier for future updates by linking to variables.
-* Tue Feb 17 2009 vuntz@novell.com
-- Review changes.
-* Tue Feb 17 2009 dominique-obs@leuenberger.net
-- Have the plugin sub-packages follow the shlib name. The plugins
-  are depending on a specific version of the lib and should be
-  installable in parallel together with multiple libs.
-  The plugins live in a versioned directory, so no conflicts can
-  happen.
-* Mon Feb 16 2009 ro@suse.de
-- added baselibs.conf
-  (libproxy0-32bit needed by libsoup-2_4-1-32bit)
-* Fri Feb 06 2009 vuntz@novell.com
-- Add missing Requires on libproxy0 for the subpackages.
-* Tue Feb 03 2009 hfiguiere@suse.de
-- Initial packaging.

libproxy-svn-303_as-needed.patch

@@ -0,0 +1,12 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 302)
++++ configure.ac	(revision 303)
+@@ -185,6 +185,7 @@
+ 
+ ### Checks for library functions.
+ AC_FUNC_MALLOC
++AC_SEARCH_LIBS([dlopen], [dl])
+ #AC_CHECK_FUNCS([gethostbyname gethostname memset socket strdup strstr])
+ 
+ AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile

libproxy.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jun 22 12:46:40 CEST 2009 - dominique-obs@leuenberger.net
+
+- Add libproxy-svn-303_as-needed.patch to successfully build with
+  --as-needed
+
+-------------------------------------------------------------------
+Tue Jun 16 13:39:41 CEST 2009 - dominique-obs@leuenberger.net
+
+- Extend baselibs.conf
+  We also need the plugins 32bit. The 32bit plugin get's installed
+  as soon as the 32bit librarz is installed. Same featureset is
+  recommended, bnc#485543
+
 -------------------------------------------------------------------
 Wed May 13 03:38:07 CEST 2009 - vuntz@novell.com
 

libproxy.spec

@@ -34,12 +34,14 @@ Name:           libproxy
 Group:          System/Libraries
 Summary:        libproxy is a library that provides automatic proxy configuration management
 Version:        0.2.3
-Release:        7
+Release:        8
 Source:         http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM libproxy-0.2.3-dbus.diff -- Taken from upstream svn
 Patch0:         libproxy-0.2.3-dbus.diff
 # PATCH-FIX-UPSTREAM libproxy-svn-277.patch -- Taken from upstream svn
 Patch1:         libproxy-svn-277.patch
+# PATCH-FIX-UPSTREAM libproxy-svn-303_as-needed.patch dominique-obs@leuenberger.net -- Taken from upstream svn
+Patch2:         libproxy-svn-303_as-needed.patch
 License:        LGPL v2.1 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkg-config
@@ -79,7 +81,7 @@ Authors:
 %if %build_core_not_plugins
 
 %package tools
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        A simple application using libproxy
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -97,7 +99,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package devel 
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        libproxy is a library that provides automatic proxy configuration management - development files
 Group:          Development/Libraries/C and C++
 Requires:       libproxy0 = %{version}
@@ -123,7 +125,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0          
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        libproxy is a library that provides automatic proxy configuration management
 Group:          System/Libraries
 
@@ -148,7 +150,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n python-libproxy
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Python bindings for libproxy
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -177,7 +179,7 @@ Authors:
 %else
 
 %package -n libproxy0-gnome
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin for GNOME configuration
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -197,7 +199,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-kde
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin for KDE configuration
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -217,7 +219,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-mozjs
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin to support wpad/pac parsing via Mozilla JavaScript Engine
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -237,7 +239,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-webkit
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin to support WPAD/PAC parsing via WebKit JavaScript Engine
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -257,7 +259,7 @@ Authors:
     Alex Panait        <kippled@gmail.com>
 
 %package -n libproxy0-networkmanager
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Summary:        Libproxy plugin for NetworkManager configuration
 Group:          System/Libraries
 Requires:       libproxy0 = %{version}
@@ -282,6 +284,7 @@ Authors:
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2
 
 %build
 autoreconf -f -i
@@ -355,48 +358,3 @@ rm $RPM_BUILD_ROOT%{_libdir}/libproxy/%{version}/plugins/file.so
 %endif
 
 %changelog
-* Wed May 13 2009 vuntz@novell.com
-- Tag patches.
-* Wed May 06 2009 vuntz@novell.com
-- Build libproxy-plugins against mozilla-xulrunner191 on
-  openSUSE > 11.1.
-* Thu Apr 23 2009 vuntz@novell.com
-- Change Name to libproxy-plugins in libproxy-plugins.spec.
-* Thu Apr 16 2009 vuntz@novell.com
-- Split the build in two steps, libproxy and libproxy-plugins, to
-  avoid a build loop: libproxy depends on libwebkit which depends
-  on libsoup which depends on libproxy. So we now have a new spec
-  file for libproxy-plugins where the libwebkit dependency is.
-* Sun Mar 15 2009 vuntz@novell.com
-- Review changes.
-* Sat Mar 14 2009 wr@rosenauer.org
-- use correct mozilla/xulrunner dependencies
-* Mon Feb 23 2009 vuntz@novell.com
-- Revert the use of %%{libproxy_shnum}: there are places where the
-  macro cannot be used (%%files, eg), and we want don't want to mix
-  libproxy0 and libproxy%%{libproxy_shnum} -- too likely to forget
-  to update one of the two instances.
-* Sun Feb 22 2009 vuntz@novell.com
-- Review changes.
-- Add Provides/Obsoletes after plugin packages renaming.
-- Don't use %%{name} everywhere: in some places, it doesn't help
-  with clarity; in some others, it could be wrong in the future (in
-  Supplements).
-* Tue Feb 17 2009 domninique-obs@leuenberger.net
-- Replace the %%{name}0 all over by %%{name}%%{libproxy_shnum}, makes
-  it easier for future updates by linking to variables.
-* Tue Feb 17 2009 vuntz@novell.com
-- Review changes.
-* Tue Feb 17 2009 dominique-obs@leuenberger.net
-- Have the plugin sub-packages follow the shlib name. The plugins
-  are depending on a specific version of the lib and should be
-  installable in parallel together with multiple libs.
-  The plugins live in a versioned directory, so no conflicts can
-  happen.
-* Mon Feb 16 2009 ro@suse.de
-- added baselibs.conf
-  (libproxy0-32bit needed by libsoup-2_4-1-32bit)
-* Fri Feb 06 2009 vuntz@novell.com
-- Add missing Requires on libproxy0 for the subpackages.
-* Tue Feb 03 2009 hfiguiere@suse.de
-- Initial packaging.