From 2a91c6526cee0d5add1473e14dc772922eac32f1c0fbe79694737d90f5ee86a4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 10 Jun 2010 06:41:20 +0000 Subject: [PATCH 1/8] Accepting request 41237 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/libproxy via accept of submit request 41237 revision 4. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/41237 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=48 --- baselibs.conf | 2 +- libproxy-0.4.2.tar.bz2 | 3 --- libproxy-0.4.3.tar.bz2 | 3 +++ libproxy-plugins.changes | 15 +++++++++++++++ libproxy-plugins.spec | 18 ++++++++++-------- libproxy.changes | 15 +++++++++++++++ libproxy.spec | 16 +++++++++------- 7 files changed, 53 insertions(+), 19 deletions(-) delete mode 100644 libproxy-0.4.2.tar.bz2 create mode 100644 libproxy-0.4.3.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 284a11f..ad47a89 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libmodman0_0_0 +libmodman0 libproxy1 libproxy1-config-gnome supplements "packageand(libproxy1-:libproxy1-gnome)" diff --git a/libproxy-0.4.2.tar.bz2 b/libproxy-0.4.2.tar.bz2 deleted file mode 100644 index 047d2b5..0000000 --- a/libproxy-0.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bececbf4aa6f01479a1166f818347884e2d99d2104b0ff9bdd8a3f54f18ff8fa -size 63868 diff --git a/libproxy-0.4.3.tar.bz2 b/libproxy-0.4.3.tar.bz2 new file mode 100644 index 0000000..d9fe728 --- /dev/null +++ b/libproxy-0.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:453bb246a06aae706df5e3252b597c1c7c69121f4f8c69e60024101d9f11e59e +size 64182 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 235bda9..34a527a 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 7 17:01:55 UTC 2010 - dimstar@opensuse.org + +- Update to version 0.4.3: + + Test can now be out-compiled using BUILD_TESTING=OFF + + Fixed python binding not handling NULL pointer + + Pyhton binding now support Python version 3 + + Rewrote URL parser to comply with unit test (bnc#612007) + + Username and password are now URL encoded + + Scheme comparison is now non-case sensitive + + Fixed deadlock using WebKit as PAC runner + + Fixed OS X compilation of Perl bindings +- libmodman0_0_0 is now correctly called libmodman0, follow this + change also in baselibs.conf + ------------------------------------------------------------------- Tue May 25 16:04:53 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 4126d6f..0dac64f 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy-plugins (Version 0.4.2) +# spec file for package libproxy (Version 0.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.2 +Version: 0.4.3 Release: 1 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 Source99: baselibs.conf @@ -133,12 +133,14 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios -%package -n libmodman0_0_0 +%package -n libmodman0 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy's Module Management Library Group: System/Libraries +Obsoletes: libmodman0_0_0 < %{version} +Provides: libmodman0_0_0 = %{version} -%description -n libmodman0_0_0 +%description -n libmodman0 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. @@ -297,7 +299,7 @@ cmake \ -DWITH_VALA=yes \ -DPERL_VENDORINSTALL=yes \ .. -%{__make} %{?jobs:-j%jobs} VERBOSE=1 +%{__make} %{?jobs:-j%jobs} %install cd build @@ -325,11 +327,11 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %post -n libproxy1 -p /sbin/ldconfig -%post -n libmodman0_0_0 -p /sbin/ldconfig +%post -n libmodman0 -p /sbin/ldconfig %postun -n libproxy1 -p /sbin/ldconfig -%postun -n libmodman0_0_0 -p /sbin/ldconfig +%postun -n libmodman0 -p /sbin/ldconfig %files tools %defattr(-, root, root) @@ -347,7 +349,7 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so #%{_libdir}/libproxy/%{version}/modules/config_direct.so #%{_libdir}/libproxy/%{version}/modules/ignore_*.so -%files -n libmodman0_0_0 +%files -n libmodman0 %defattr(-, root, root) %{_libdir}/libmodman.so.* diff --git a/libproxy.changes b/libproxy.changes index 235bda9..34a527a 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 7 17:01:55 UTC 2010 - dimstar@opensuse.org + +- Update to version 0.4.3: + + Test can now be out-compiled using BUILD_TESTING=OFF + + Fixed python binding not handling NULL pointer + + Pyhton binding now support Python version 3 + + Rewrote URL parser to comply with unit test (bnc#612007) + + Username and password are now URL encoded + + Scheme comparison is now non-case sensitive + + Fixed deadlock using WebKit as PAC runner + + Fixed OS X compilation of Perl bindings +- libmodman0_0_0 is now correctly called libmodman0, follow this + change also in baselibs.conf + ------------------------------------------------------------------- Tue May 25 16:04:53 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index e8f8b6a..ad54c91 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.2 +Version: 0.4.3 Release: 1 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 Source99: baselibs.conf @@ -133,12 +133,14 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios -%package -n libmodman0_0_0 +%package -n libmodman0 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy's Module Management Library Group: System/Libraries +Obsoletes: libmodman0_0_0 < %{version} +Provides: libmodman0_0_0 = %{version} -%description -n libmodman0_0_0 +%description -n libmodman0 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. @@ -297,7 +299,7 @@ cmake \ -DWITH_VALA=yes \ -DPERL_VENDORINSTALL=yes \ .. -%{__make} %{?jobs:-j%jobs} VERBOSE=1 +%{__make} %{?jobs:-j%jobs} %install cd build @@ -325,11 +327,11 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %post -n libproxy1 -p /sbin/ldconfig -%post -n libmodman0_0_0 -p /sbin/ldconfig +%post -n libmodman0 -p /sbin/ldconfig %postun -n libproxy1 -p /sbin/ldconfig -%postun -n libmodman0_0_0 -p /sbin/ldconfig +%postun -n libmodman0 -p /sbin/ldconfig %files tools %defattr(-, root, root) @@ -347,7 +349,7 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so #%{_libdir}/libproxy/%{version}/modules/config_direct.so #%{_libdir}/libproxy/%{version}/modules/ignore_*.so -%files -n libmodman0_0_0 +%files -n libmodman0 %defattr(-, root, root) %{_libdir}/libmodman.so.* From d2c7339d45e49810c2746b05c13cd1c73a584364b234ef1d438a0bbe87bc2ca9 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 11 Jun 2010 08:26:56 +0000 Subject: [PATCH 2/8] Accepting request 41299 from GNOME:Factory checked in (request 41299) OBS-URL: https://build.opensuse.org/request/show/41299 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=49 --- baselibs.conf | 2 +- libproxy-0.4.2.tar.bz2 | 3 +++ libproxy-0.4.3.tar.bz2 | 3 --- libproxy-plugins.changes | 15 --------------- libproxy-plugins.spec | 18 ++++++++---------- libproxy.changes | 15 --------------- libproxy.spec | 16 +++++++--------- 7 files changed, 19 insertions(+), 53 deletions(-) create mode 100644 libproxy-0.4.2.tar.bz2 delete mode 100644 libproxy-0.4.3.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index ad47a89..284a11f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libmodman0 +libmodman0_0_0 libproxy1 libproxy1-config-gnome supplements "packageand(libproxy1-:libproxy1-gnome)" diff --git a/libproxy-0.4.2.tar.bz2 b/libproxy-0.4.2.tar.bz2 new file mode 100644 index 0000000..047d2b5 --- /dev/null +++ b/libproxy-0.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bececbf4aa6f01479a1166f818347884e2d99d2104b0ff9bdd8a3f54f18ff8fa +size 63868 diff --git a/libproxy-0.4.3.tar.bz2 b/libproxy-0.4.3.tar.bz2 deleted file mode 100644 index d9fe728..0000000 --- a/libproxy-0.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:453bb246a06aae706df5e3252b597c1c7c69121f4f8c69e60024101d9f11e59e -size 64182 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 34a527a..235bda9 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 7 17:01:55 UTC 2010 - dimstar@opensuse.org - -- Update to version 0.4.3: - + Test can now be out-compiled using BUILD_TESTING=OFF - + Fixed python binding not handling NULL pointer - + Pyhton binding now support Python version 3 - + Rewrote URL parser to comply with unit test (bnc#612007) - + Username and password are now URL encoded - + Scheme comparison is now non-case sensitive - + Fixed deadlock using WebKit as PAC runner - + Fixed OS X compilation of Perl bindings -- libmodman0_0_0 is now correctly called libmodman0, follow this - change also in baselibs.conf - ------------------------------------------------------------------- Tue May 25 16:04:53 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 0dac64f..4126d6f 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy (Version 0.4.2) +# spec file for package libproxy-plugins (Version 0.4.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.3 +Version: 0.4.2 Release: 1 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 Source99: baselibs.conf @@ -133,14 +133,12 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios -%package -n libmodman0 +%package -n libmodman0_0_0 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy's Module Management Library Group: System/Libraries -Obsoletes: libmodman0_0_0 < %{version} -Provides: libmodman0_0_0 = %{version} -%description -n libmodman0 +%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. @@ -299,7 +297,7 @@ cmake \ -DWITH_VALA=yes \ -DPERL_VENDORINSTALL=yes \ .. -%{__make} %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} VERBOSE=1 %install cd build @@ -327,11 +325,11 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %post -n libproxy1 -p /sbin/ldconfig -%post -n libmodman0 -p /sbin/ldconfig +%post -n libmodman0_0_0 -p /sbin/ldconfig %postun -n libproxy1 -p /sbin/ldconfig -%postun -n libmodman0 -p /sbin/ldconfig +%postun -n libmodman0_0_0 -p /sbin/ldconfig %files tools %defattr(-, root, root) @@ -349,7 +347,7 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so #%{_libdir}/libproxy/%{version}/modules/config_direct.so #%{_libdir}/libproxy/%{version}/modules/ignore_*.so -%files -n libmodman0 +%files -n libmodman0_0_0 %defattr(-, root, root) %{_libdir}/libmodman.so.* diff --git a/libproxy.changes b/libproxy.changes index 34a527a..235bda9 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 7 17:01:55 UTC 2010 - dimstar@opensuse.org - -- Update to version 0.4.3: - + Test can now be out-compiled using BUILD_TESTING=OFF - + Fixed python binding not handling NULL pointer - + Pyhton binding now support Python version 3 - + Rewrote URL parser to comply with unit test (bnc#612007) - + Username and password are now URL encoded - + Scheme comparison is now non-case sensitive - + Fixed deadlock using WebKit as PAC runner - + Fixed OS X compilation of Perl bindings -- libmodman0_0_0 is now correctly called libmodman0, follow this - change also in baselibs.conf - ------------------------------------------------------------------- Tue May 25 16:04:53 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index ad54c91..e8f8b6a 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.3 +Version: 0.4.2 Release: 1 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 Source99: baselibs.conf @@ -133,14 +133,12 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios -%package -n libmodman0 +%package -n libmodman0_0_0 License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy's Module Management Library Group: System/Libraries -Obsoletes: libmodman0_0_0 < %{version} -Provides: libmodman0_0_0 = %{version} -%description -n libmodman0 +%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. @@ -299,7 +297,7 @@ cmake \ -DWITH_VALA=yes \ -DPERL_VENDORINSTALL=yes \ .. -%{__make} %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} VERBOSE=1 %install cd build @@ -327,11 +325,11 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %post -n libproxy1 -p /sbin/ldconfig -%post -n libmodman0 -p /sbin/ldconfig +%post -n libmodman0_0_0 -p /sbin/ldconfig %postun -n libproxy1 -p /sbin/ldconfig -%postun -n libmodman0 -p /sbin/ldconfig +%postun -n libmodman0_0_0 -p /sbin/ldconfig %files tools %defattr(-, root, root) @@ -349,7 +347,7 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so #%{_libdir}/libproxy/%{version}/modules/config_direct.so #%{_libdir}/libproxy/%{version}/modules/ignore_*.so -%files -n libmodman0 +%files -n libmodman0_0_0 %defattr(-, root, root) %{_libdir}/libmodman.so.* From 30feafa4646b33400fca6ec8bfe10bd9688fc6e08ad6513539daddaa118836f8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 24 Aug 2010 15:43:14 +0000 Subject: [PATCH 3/8] Accepting request 46128 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/libproxy via accept of submit request 46128 revision 15. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/46128 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=50 --- baselibs.conf | 1 - libproxy-0.4.2.tar.bz2 | 3 - libproxy-0.4.5.tar.bz2 | 3 + libproxy-plugins.changes | 79 +++++++++++++ libproxy-plugins.spec | 244 +++++++++++++++++++++++---------------- libproxy.changes | 79 +++++++++++++ libproxy.spec | 244 +++++++++++++++++++++++---------------- update-from-svn.sh | 29 +++++ 8 files changed, 484 insertions(+), 198 deletions(-) delete mode 100644 libproxy-0.4.2.tar.bz2 create mode 100644 libproxy-0.4.5.tar.bz2 create mode 100644 update-from-svn.sh diff --git a/baselibs.conf b/baselibs.conf index 284a11f..a3b6276 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,3 @@ -libmodman0_0_0 libproxy1 libproxy1-config-gnome supplements "packageand(libproxy1-:libproxy1-gnome)" diff --git a/libproxy-0.4.2.tar.bz2 b/libproxy-0.4.2.tar.bz2 deleted file mode 100644 index 047d2b5..0000000 --- a/libproxy-0.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bececbf4aa6f01479a1166f818347884e2d99d2104b0ff9bdd8a3f54f18ff8fa -size 63868 diff --git a/libproxy-0.4.5.tar.bz2 b/libproxy-0.4.5.tar.bz2 new file mode 100644 index 0000000..f934302 --- /dev/null +++ b/libproxy-0.4.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cccd9aff6304c7b687ef2364cd95475e6771d3920a521ad1b1d9c3cc70d13d1 +size 70452 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 235bda9..1cd010c 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,82 @@ +------------------------------------------------------------------- +Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org + +- Mono bindings are not available for all supported platforms, + thus wrapping it in a if have_mono [...] endif. + +------------------------------------------------------------------- +Thu Aug 19 22:16:22 UTC 2010 - dimstar@opensuse.org + +- Check for build_snapshot: the svn snapshot project contains + unversioned tarballs. + +------------------------------------------------------------------- +Thu Aug 19 15:49:02 UTC 2010 - dimstar@opensuse.org + +- Update to version 0.4.5: + + C# bindings are installable (-DWITH_DOTNET=ON) + + C# bindings installation path can be changed using -DGAC_DIR= + + Internal libmodman build fixed + + Installation dirs are now all relative to CMAKE_INSTALL_PREFIX + + Fixed test while using --as-needed linker flag + + Fixed generation of libproxy-1.0.pc + + Basic support for Mingw added (not yet 100% functional) + + Ruby binding implemented (not yet in the build system) + + Fixed modules not being found caused by relative + LIBEXEC_INSTALL_DIR + + Fixed bug with builtin plugins (Issue 133) + + Vala bindings installation path can be changed using + -DVAPI_DIR= + + Python bindings installation path can be changed using + -DPYTHON_SITEPKG_DIR= + + Perl bindings can be installed in vendor directory + (-DPERL_VENDORARCH=ON) + + Perl bindings installation path can be change using + -DPX_PERL_ARCH= + + Unit test now builds on OSX +- Changes from version 0.4.4: + + Add support for optionally building using a system libmodman + + Rework build system to be cleaner + + Fix two major build system bugs: 127, 128 + +------------------------------------------------------------------- +Mon Jul 5 21:42:37 UTC 2010 - dimstar@opensuse.org + +- Add mono-devel BuildRequires to install the csharp bindings. + +------------------------------------------------------------------- +Tue Jun 22 17:48:31 UTC 2010 - dimstar@opensuse.org + +- Initial work to support win32 cross building. + +------------------------------------------------------------------- +Mon Jun 14 17:48:01 UTC 2010 - dimstar@opensuse.org + +- Use external libmodman: add libmodman-devel BuildRequires. +- Drop libmodman0 subpackage + +------------------------------------------------------------------- +Wed Jun 9 22:52:05 UTC 2010 - dimstar@opensuse.org + +- Enable build on other distributions than openSUSE, wrapping + openSUSE rpm tags like Recommends and Supplements in %if + statements. + +------------------------------------------------------------------- +Mon Jun 7 17:01:55 UTC 2010 - dimstar@opensuse.org + +- Update to version 0.4.3: + + Test can now be out-compiled using BUILD_TESTING=OFF + + Fixed python binding not handling NULL pointer + + Pyhton binding now support Python version 3 + + Rewrote URL parser to comply with unit test (bnc#612007) + + Username and password are now URL encoded + + Scheme comparison is now non-case sensitive + + Fixed deadlock using WebKit as PAC runner + + Fixed OS X compilation of Perl bindings +- libmodman0_0_0 is now correctly called libmodman0, follow this + change also in baselibs.conf + ------------------------------------------------------------------- Tue May 25 16:04:53 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 4126d6f..a34b606 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,8 +1,7 @@ # -# spec file for package libproxy-plugins (Version 0.4.2) +# spec file for package libproxy (Version 0.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,56 +15,75 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define build_core_not_modules 0 -%if 0%{suse_version} > 1120 +%if 0%{?suse_version} +%define have_mono 1 +%else +%define have_mono 0 +%endif + +%if 0%{?suse_version} > 1120 %define xulrunner_ver 192 %else -%if 0%{suse_version} > 1110 +%if 0%{?suse_version} > 1110 %define xulrunner_ver 191 %else -%if 0%{suse_version} >= 1100 -%define xulrunner_ver 190 -%else %define xulrunner_ver 181 %endif %endif -%endif Url: http://code.google.com/p/libproxy/ %define _name libproxy Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.2 +%if 0%{?build_snapshot} +%define svn_rev .svn.739 +%endif +Version: 0.4.5%{?svn_rev} +%if ! 0%{?build_snapshot} +%define version_ext -%{version} +%endif Release: 1 -Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 +Source: http://libproxy.googlecode.com/files/%{_name}%{?version_ext}.tar.bz2 +# Script used for automatic snapshot updates +Source98: update-from-svn.sh Source99: baselibs.conf License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: libmodman-devel +BuildRequires: pkgconfig BuildRequires: zlib-devel -%if !%build_core_not_modules +%if !%{build_core_not_modules} +%if ! 0%{?windows} BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 BuildRequires: libwebkit-devel +%if 0%{?suse_version} BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel +%else +BuildRequires: xulrunner-devel +%endif BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +%endif %else BuildRequires: python-devel +%if 0%{?have_mono} +BuildRequires: mono-devel +%endif +BuildRequires: perl %endif -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%endif +%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} %description libproxy offers the following features: * extremely small core @@ -73,11 +91,8 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -107,11 +122,8 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -126,31 +138,19 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * 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 +%if 0%{?suse_version} > 1110 BuildArch: noarch -Requires: libproxy1 = %{version} %py_requires +%endif +Requires: libproxy1 = %{version} %description -n python-libproxy libproxy offers the following features: * extremely small core @@ -158,11 +158,8 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -171,7 +168,8 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Perl bindings for libproxy Group: Development/Libraries/Perl Requires: libproxy1 = %{version} -Requires: perl = %{perl_version} +# For Fedora at least perl = perl_version does not work. +Requires: perl >= %{perl_version} %description -n perl-Net-Libproxy libproxy offers the following features: * extremely small core @@ -179,14 +177,11 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios - +%if 0%{?have_mono} %package -n libproxy-sharp License: GPLv2+ ; LGPLv2.1+ Summary: .Net bindings for libproxy @@ -199,13 +194,10 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios - +%endif %else @@ -214,9 +206,12 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for GNOME configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:gconf2) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} @@ -230,9 +225,12 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:libkde4) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-kde = %{version} Obsoletes: libproxy-kde < %{version} @@ -246,7 +244,9 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -260,7 +260,9 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} -Supplements: packageand(libproxy1:libwebkit-1) +%if 0%{?suse_version} +Supplements: packageand(libproxy1:libwebkitgtk-0) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -268,13 +270,14 @@ Provides: libproxy1-pacrunner = %{version} A module to extend libproxy with capabilities to pass addresses to a WPAD/PAC script and have it find the correct proxy. - %package -n libproxy1-networkmanager License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:NetworkManager) +%endif %description -n libproxy1-networkmanager A module to extend libproxy with capabilities to query NetworkManager @@ -283,88 +286,132 @@ about network configuration changes. %endif %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{_name}%{?version_ext} mkdir build %build cd build +export CXXFLAGS="%{optflags}" +export CFLAGS="%{optflags}" +%if 0%{?suse_version} < 1120 && 0%{?suse_version} +export CXXFLAGS="%{optflags} -DXP_UNIX" +%endif +%if 0%{?windows} +export CXXFLAGS="%{optflags} -fno-stack-protector -static-libgcc" +%endif cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -Dlibdir=%{_libdir} \ - -Dlibexecdir=%{_libexecdir}/libproxy \ - -Ddatadir=%{_datadir} \ - -Dmoduledir=%{_libdir}/libproxy/%{version}/modules \ +%if 0%{?windows} + -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw32.cmake \ + -DBUILD_TESTING=False \ + -DWITH_DOTNET=OFF \ +%else -DWITH_VALA=yes \ + -DWITH_DOTNET=%{have_mono} \ + -DFORCE_SYSTEM_LIBMODMAN=ON \ +%endif + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DBIN_INSTALL_DIR=%{_bindir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ + -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DSHARE_INSTALL_PREFIX=%{_datadir} \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ +%if ! %build_core_not_modules + -DWITH_DOTNET=OFF \ +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1120 + -DCMAKE_BUILD_TYPE=DebugFull \ + -DCMAKE_INSTALL_CONFIG_NAME=DebugFull \ +%else + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ +%endif .. -%{__make} %{?jobs:-j%jobs} VERBOSE=1 +%{__make} VERBOSE=1 %install cd build -%makeinstall +make DESTDIR=%{buildroot} install + +# On Windows we also do not want to provide the static libraries. +%if 0%{?windows} +find %{buildroot}%{_libdir} -name '*.dll.a' -delete -print +rm %{buildroot}%{_libdir}/libmodman.dll +%endif + %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 +install -d %{buildroot}%{_libexecdir}/libproxy-%{version} +install -d %{buildroot}%{_libdir}/%{name}-%{version}/modules %else # remove files that are part of the core -rm %{buildroot}%{_includedir}/*.h +rm -f %{buildroot}%{_includedir}/*.h # 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 -rm %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake -rm %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi -rm %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm -rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +rm -f %{buildroot}%{_bindir}/proxy%{?windows:.exe} +rm -f %{buildroot}%{_libdir}/libproxy.* +rm -f %{buildroot}%{python_sitelib}/*.py +rm -f %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc +rm -f %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake +rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi +rm -f %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm +rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %endif + +%check +cd build +make test + %if %build_core_not_modules %post -n libproxy1 -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 +%{_bindir}/proxy%{?windows:.exe} %files -n libproxy1 %defattr(-, root, root) +%doc COPYING README AUTHORS +%if ! 0%{?windows} %{_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 - -%files -n libmodman0_0_0 -%defattr(-, root, root) -%{_libdir}/libmodman.so.* +%else +%{_libdir}/libproxy.dll +%endif +%dir %{_libexecdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version}/modules %files devel %defattr(-, root, root) %{_includedir}/*.h +%if ! 0%{?windows} %{_libdir}/*.so %{_libdir}/pkgconfig/libproxy-1.0.pc +%if 0%{have_mono} +%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc +%endif %{_datadir}/cmake/Modules/Findlibproxy.cmake %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/libproxy-1.0.vapi +%endif %files -n python-libproxy %defattr(-, root, root) %{python_sitelib}/*.py +%if 0%{?have_mono} +%files -n libproxy-sharp +%defattr(-, root, root) +%{_assemblies_dir}/gac/libproxy-sharp +%{_assemblies_dir}/libproxy-sharp +%endif + +%if ! 0%{?windows} %files -n perl-Net-Libproxy %defattr(-,root,root) %dir %{perl_vendorarch}/Net @@ -372,28 +419,31 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %dir %{perl_vendorarch}/auto/Net/Libproxy %{perl_vendorarch}/Net/Libproxy.pm %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +%endif %else +%if ! 0%{?windows} %files -n libproxy1-config-kde4 %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_kde4.so +%{_libdir}/libproxy-%{version}/modules/config_kde4.so %files -n libproxy1-config-gnome %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_gnome.so -%{_libexecdir}/libproxy/pxgconf +%{_libdir}/libproxy-%{version}/modules/config_gnome.so +%{_libexecdir}/libproxy-%{version}/pxgconf %files -n libproxy1-networkmanager %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so +%{_libdir}/libproxy-%{version}/modules/network_networkmanager.so %files -n libproxy1-pacrunner-webkit %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_webkit.so %files -n libproxy1-pacrunner-mozjs %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_mozjs.so +%endif %endif %changelog diff --git a/libproxy.changes b/libproxy.changes index 235bda9..1cd010c 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,82 @@ +------------------------------------------------------------------- +Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org + +- Mono bindings are not available for all supported platforms, + thus wrapping it in a if have_mono [...] endif. + +------------------------------------------------------------------- +Thu Aug 19 22:16:22 UTC 2010 - dimstar@opensuse.org + +- Check for build_snapshot: the svn snapshot project contains + unversioned tarballs. + +------------------------------------------------------------------- +Thu Aug 19 15:49:02 UTC 2010 - dimstar@opensuse.org + +- Update to version 0.4.5: + + C# bindings are installable (-DWITH_DOTNET=ON) + + C# bindings installation path can be changed using -DGAC_DIR= + + Internal libmodman build fixed + + Installation dirs are now all relative to CMAKE_INSTALL_PREFIX + + Fixed test while using --as-needed linker flag + + Fixed generation of libproxy-1.0.pc + + Basic support for Mingw added (not yet 100% functional) + + Ruby binding implemented (not yet in the build system) + + Fixed modules not being found caused by relative + LIBEXEC_INSTALL_DIR + + Fixed bug with builtin plugins (Issue 133) + + Vala bindings installation path can be changed using + -DVAPI_DIR= + + Python bindings installation path can be changed using + -DPYTHON_SITEPKG_DIR= + + Perl bindings can be installed in vendor directory + (-DPERL_VENDORARCH=ON) + + Perl bindings installation path can be change using + -DPX_PERL_ARCH= + + Unit test now builds on OSX +- Changes from version 0.4.4: + + Add support for optionally building using a system libmodman + + Rework build system to be cleaner + + Fix two major build system bugs: 127, 128 + +------------------------------------------------------------------- +Mon Jul 5 21:42:37 UTC 2010 - dimstar@opensuse.org + +- Add mono-devel BuildRequires to install the csharp bindings. + +------------------------------------------------------------------- +Tue Jun 22 17:48:31 UTC 2010 - dimstar@opensuse.org + +- Initial work to support win32 cross building. + +------------------------------------------------------------------- +Mon Jun 14 17:48:01 UTC 2010 - dimstar@opensuse.org + +- Use external libmodman: add libmodman-devel BuildRequires. +- Drop libmodman0 subpackage + +------------------------------------------------------------------- +Wed Jun 9 22:52:05 UTC 2010 - dimstar@opensuse.org + +- Enable build on other distributions than openSUSE, wrapping + openSUSE rpm tags like Recommends and Supplements in %if + statements. + +------------------------------------------------------------------- +Mon Jun 7 17:01:55 UTC 2010 - dimstar@opensuse.org + +- Update to version 0.4.3: + + Test can now be out-compiled using BUILD_TESTING=OFF + + Fixed python binding not handling NULL pointer + + Pyhton binding now support Python version 3 + + Rewrote URL parser to comply with unit test (bnc#612007) + + Username and password are now URL encoded + + Scheme comparison is now non-case sensitive + + Fixed deadlock using WebKit as PAC runner + + Fixed OS X compilation of Perl bindings +- libmodman0_0_0 is now correctly called libmodman0, follow this + change also in baselibs.conf + ------------------------------------------------------------------- Tue May 25 16:04:53 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index e8f8b6a..0ed6a04 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,8 +1,7 @@ # -# spec file for package libproxy (Version 0.4.2) +# spec file for package libproxy (Version 0.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - %define build_core_not_modules 1 -%if 0%{suse_version} > 1120 +%if 0%{?suse_version} +%define have_mono 1 +%else +%define have_mono 0 +%endif + +%if 0%{?suse_version} > 1120 %define xulrunner_ver 192 %else -%if 0%{suse_version} > 1110 +%if 0%{?suse_version} > 1110 %define xulrunner_ver 191 %else -%if 0%{suse_version} >= 1100 %define xulrunner_ver 190 -%else -%define xulrunner_ver 181 -%endif %endif %endif Url: http://code.google.com/p/libproxy/ @@ -38,34 +37,53 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.2 +%if 0%{?build_snapshot} +%define svn_rev .svn.739 +%endif +Version: 0.4.5%{?svn_rev} +%if ! 0%{?build_snapshot} +%define version_ext -%{version} +%endif Release: 1 -Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 +Source: http://libproxy.googlecode.com/files/%{_name}%{?version_ext}.tar.bz2 +# Script used for automatic snapshot updates +Source98: update-from-svn.sh Source99: baselibs.conf License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: libmodman-devel +BuildRequires: pkgconfig BuildRequires: zlib-devel -%if !%build_core_not_modules +%if !%{build_core_not_modules} +%if ! 0%{?windows} BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 BuildRequires: libwebkit-devel +%if 0%{?suse_version} BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel +%else +BuildRequires: xulrunner-devel +%endif BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +%endif %else +%if 0%{?have_mono} +BuildRequires: mono-devel +%endif +BuildRequires: perl BuildRequires: python-devel %endif -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%endif +%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} %description libproxy offers the following features: * extremely small core @@ -73,11 +91,8 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -107,11 +122,8 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -126,31 +138,19 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * 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 +%if 0%{?suse_version} > 1110 BuildArch: noarch -Requires: libproxy1 = %{version} %py_requires +%endif +Requires: libproxy1 = %{version} %description -n python-libproxy libproxy offers the following features: * extremely small core @@ -158,11 +158,8 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -171,7 +168,8 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Perl bindings for libproxy Group: Development/Libraries/Perl Requires: libproxy1 = %{version} -Requires: perl = %{perl_version} +# For Fedora at least perl = perl_version does not work. +Requires: perl >= %{perl_version} %description -n perl-Net-Libproxy libproxy offers the following features: * extremely small core @@ -179,14 +177,11 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios - +%if 0%{?have_mono} %package -n libproxy-sharp License: GPLv2+ ; LGPLv2.1+ Summary: .Net bindings for libproxy @@ -199,13 +194,10 @@ libproxy offers the following features: * extremely small core * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios - +%endif %else @@ -214,9 +206,12 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for GNOME configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:gconf2) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} @@ -230,9 +225,12 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:libkde4) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-kde = %{version} Obsoletes: libproxy-kde < %{version} @@ -246,7 +244,9 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -260,7 +260,9 @@ License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} -Supplements: packageand(libproxy1:libwebkit-1) +%if 0%{?suse_version} +Supplements: packageand(libproxy1:libwebkitgtk-0) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -268,13 +270,14 @@ Provides: libproxy1-pacrunner = %{version} A module to extend libproxy with capabilities to pass addresses to a WPAD/PAC script and have it find the correct proxy. - %package -n libproxy1-networkmanager License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:NetworkManager) +%endif %description -n libproxy1-networkmanager A module to extend libproxy with capabilities to query NetworkManager @@ -283,88 +286,132 @@ about network configuration changes. %endif %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{_name}%{?version_ext} mkdir build %build cd build +export CXXFLAGS="%{optflags}" +export CFLAGS="%{optflags}" +%if 0%{?suse_version} < 1120 && 0%{?suse_version} +export CXXFLAGS="%{optflags} -DXP_UNIX" +%endif +%if 0%{?windows} +export CXXFLAGS="%{optflags} -fno-stack-protector -static-libgcc" +%endif cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -Dlibdir=%{_libdir} \ - -Dlibexecdir=%{_libexecdir}/libproxy \ - -Ddatadir=%{_datadir} \ - -Dmoduledir=%{_libdir}/libproxy/%{version}/modules \ +%if 0%{?windows} + -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw32.cmake \ + -DBUILD_TESTING=False \ + -DWITH_DOTNET=OFF \ +%else -DWITH_VALA=yes \ + -DWITH_DOTNET=%{have_mono} \ + -DFORCE_SYSTEM_LIBMODMAN=ON \ +%endif + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DBIN_INSTALL_DIR=%{_bindir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ + -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DSHARE_INSTALL_PREFIX=%{_datadir} \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ +%if ! %build_core_not_modules + -DWITH_DOTNET=OFF \ +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1120 + -DCMAKE_BUILD_TYPE=DebugFull \ + -DCMAKE_INSTALL_CONFIG_NAME=DebugFull \ +%else + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ +%endif .. -%{__make} %{?jobs:-j%jobs} VERBOSE=1 +%{__make} VERBOSE=1 %install cd build -%makeinstall +make DESTDIR=%{buildroot} install + +# On Windows we also do not want to provide the static libraries. +%if 0%{?windows} +find %{buildroot}%{_libdir} -name '*.dll.a' -delete -print +rm %{buildroot}%{_libdir}/libmodman.dll +%endif + %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 +install -d %{buildroot}%{_libexecdir}/libproxy-%{version} +install -d %{buildroot}%{_libdir}/%{name}-%{version}/modules %else # remove files that are part of the core -rm %{buildroot}%{_includedir}/*.h +rm -f %{buildroot}%{_includedir}/*.h # 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 -rm %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake -rm %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi -rm %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm -rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +rm -f %{buildroot}%{_bindir}/proxy%{?windows:.exe} +rm -f %{buildroot}%{_libdir}/libproxy.* +rm -f %{buildroot}%{python_sitelib}/*.py +rm -f %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc +rm -f %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake +rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi +rm -f %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm +rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %endif + +%check +cd build +make test + %if %build_core_not_modules %post -n libproxy1 -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 +%{_bindir}/proxy%{?windows:.exe} %files -n libproxy1 %defattr(-, root, root) +%doc COPYING README AUTHORS +%if ! 0%{?windows} %{_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 - -%files -n libmodman0_0_0 -%defattr(-, root, root) -%{_libdir}/libmodman.so.* +%else +%{_libdir}/libproxy.dll +%endif +%dir %{_libexecdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version}/modules %files devel %defattr(-, root, root) %{_includedir}/*.h +%if ! 0%{?windows} %{_libdir}/*.so %{_libdir}/pkgconfig/libproxy-1.0.pc +%if 0%{have_mono} +%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc +%endif %{_datadir}/cmake/Modules/Findlibproxy.cmake %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/libproxy-1.0.vapi +%endif %files -n python-libproxy %defattr(-, root, root) %{python_sitelib}/*.py +%if 0%{?have_mono} +%files -n libproxy-sharp +%defattr(-, root, root) +%{_assemblies_dir}/gac/libproxy-sharp +%{_assemblies_dir}/libproxy-sharp +%endif + +%if ! 0%{?windows} %files -n perl-Net-Libproxy %defattr(-,root,root) %dir %{perl_vendorarch}/Net @@ -372,28 +419,31 @@ rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %dir %{perl_vendorarch}/auto/Net/Libproxy %{perl_vendorarch}/Net/Libproxy.pm %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +%endif %else +%if ! 0%{?windows} %files -n libproxy1-config-kde4 %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_kde4.so +%{_libdir}/libproxy-%{version}/modules/config_kde4.so %files -n libproxy1-config-gnome %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_gnome.so -%{_libexecdir}/libproxy/pxgconf +%{_libdir}/libproxy-%{version}/modules/config_gnome.so +%{_libexecdir}/libproxy-%{version}/pxgconf %files -n libproxy1-networkmanager %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so +%{_libdir}/libproxy-%{version}/modules/network_networkmanager.so %files -n libproxy1-pacrunner-webkit %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_webkit.so %files -n libproxy1-pacrunner-mozjs %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_mozjs.so +%endif %endif %changelog diff --git a/update-from-svn.sh b/update-from-svn.sh new file mode 100644 index 0000000..3e51e1e --- /dev/null +++ b/update-from-svn.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +MODULE=$(basename $(pwd)) + +if [ ! -x /usr/bin/svn ]; then + echo "subversion is missing - aborting" + return 1 +fi + +if [ ! -d $MODULE ]; then + echo "Base directory of $MODULE checkout is missing - aborting" + exit 2 +fi + +pushd $MODULE +svn update +VERSION=$(grep "version" $MODULE/CMakeLists.txt | awk -F'(' '{print $2}' | awk '{print $1+0"."$2+0"."$3+0}') +SVNREV=$(svn info | awk '/Revision:/ { print $2 }') +popd + +# Adjust the version information and svn rev in the spec file to what we get from the svn checkout. +sed -i "s/%define.*svn_rev.*/%define svn_rev .svn.$SVNREV/" $MODULE.spec +sed -i "s/Version:.*/Version: ${VERSION}%{?svn_rev}/" $MODULE.spec + +tar cjf $MODULE.tar.bz2 $MODULE + +[ -f pre_checkin.sh ] && sh pre_checkin.sh + +osc ci -m "Update to ${VERSION/git/svn.$SVNREV}" --skip-validation From f8e8abf7a0eaeffbf19827ecd27a73ee53093a4b22700161092ab7fc985dd08d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 27 Aug 2010 22:58:31 +0000 Subject: [PATCH 4/8] Accepting request 46522 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/libproxy via accept of submit request 46522 revision 3. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/46522 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=51 --- libproxy-plugins.spec | 21 ++++++++++----------- libproxy.spec | 17 ++++++++--------- update-from-svn.sh | 3 +-- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index a34b606..1208e05 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -28,7 +28,7 @@ %if 0%{?suse_version} > 1110 %define xulrunner_ver 191 %else -%define xulrunner_ver 181 +%define xulrunner_ver 190 %endif %endif Url: http://code.google.com/p/libproxy/ @@ -37,15 +37,14 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -%if 0%{?build_snapshot} -%define svn_rev .svn.739 -%endif -Version: 0.4.5%{?svn_rev} -%if ! 0%{?build_snapshot} -%define version_ext -%{version} -%endif +Version: 0.4.5 Release: 1 -Source: http://libproxy.googlecode.com/files/%{_name}%{?version_ext}.tar.bz2 +%if 0%{?build_snapshot} +%define _sourcename %{_name} +%else +%define _sourcename %{_name}-%{version} +%endif +Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf @@ -74,11 +73,11 @@ BuildRequires: libkde4-devel BuildRequires: libqt4-devel %endif %else -BuildRequires: python-devel %if 0%{?have_mono} BuildRequires: mono-devel %endif BuildRequires: perl +BuildRequires: python-devel %endif %{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} @@ -286,7 +285,7 @@ about network configuration changes. %endif %prep -%setup -q -n %{_name}%{?version_ext} +%setup -q -n %{_sourcename} mkdir build %build diff --git a/libproxy.spec b/libproxy.spec index 0ed6a04..e105e8e 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -37,15 +37,14 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -%if 0%{?build_snapshot} -%define svn_rev .svn.739 -%endif -Version: 0.4.5%{?svn_rev} -%if ! 0%{?build_snapshot} -%define version_ext -%{version} -%endif +Version: 0.4.5 Release: 1 -Source: http://libproxy.googlecode.com/files/%{_name}%{?version_ext}.tar.bz2 +%if 0%{?build_snapshot} +%define _sourcename %{_name} +%else +%define _sourcename %{_name}-%{version} +%endif +Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf @@ -286,7 +285,7 @@ about network configuration changes. %endif %prep -%setup -q -n %{_name}%{?version_ext} +%setup -q -n %{_sourcename} mkdir build %build diff --git a/update-from-svn.sh b/update-from-svn.sh index 3e51e1e..1fa6166 100644 --- a/update-from-svn.sh +++ b/update-from-svn.sh @@ -19,8 +19,7 @@ SVNREV=$(svn info | awk '/Revision:/ { print $2 }') popd # Adjust the version information and svn rev in the spec file to what we get from the svn checkout. -sed -i "s/%define.*svn_rev.*/%define svn_rev .svn.$SVNREV/" $MODULE.spec -sed -i "s/Version:.*/Version: ${VERSION}%{?svn_rev}/" $MODULE.spec +sed -i "s/Version:.*/Version: ${VERSION}.svn.$SVNREV/" $MODULE.spec tar cjf $MODULE.tar.bz2 $MODULE From e23b109a28ee6081e07f8c00d1af452fa06a2eff5779c97c37ec8abf39bbb879 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 2 Sep 2010 08:20:43 +0000 Subject: [PATCH 5/8] Accepting request 46970 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/libproxy via accept of submit request 46970 revision 3. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/46970 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=52 --- libproxy-0.4.5.tar.bz2 | 3 --- libproxy-0.4.6.tar.bz2 | 3 +++ libproxy-plugins.changes | 9 +++++++++ libproxy-plugins.spec | 5 +++-- libproxy.changes | 9 +++++++++ libproxy.spec | 5 +++-- 6 files changed, 27 insertions(+), 7 deletions(-) delete mode 100644 libproxy-0.4.5.tar.bz2 create mode 100644 libproxy-0.4.6.tar.bz2 diff --git a/libproxy-0.4.5.tar.bz2 b/libproxy-0.4.5.tar.bz2 deleted file mode 100644 index f934302..0000000 --- a/libproxy-0.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cccd9aff6304c7b687ef2364cd95475e6771d3920a521ad1b1d9c3cc70d13d1 -size 70452 diff --git a/libproxy-0.4.6.tar.bz2 b/libproxy-0.4.6.tar.bz2 new file mode 100644 index 0000000..8039232 --- /dev/null +++ b/libproxy-0.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be19e35cec7de2159ad68b620665f02c25938d186697176125e9ad89220fb85 +size 71816 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 1cd010c..68e7474 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 2 09:38:47 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.4.6: + + Fixed a crash in the URL parser + + Fixed build issues with Visual Studio + + Updated the INSTALL file + + Install Python binding in prefix path if site-packages exists + ------------------------------------------------------------------- Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 1208e05..ec78ee6 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy (Version 0.4.5) +# spec file for package libproxy (Version 0.4.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,7 +37,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.5 +Version: 0.4.6 Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} @@ -313,6 +313,7 @@ cmake \ -DLIB_INSTALL_DIR=%{_libdir} \ -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DPYTHON_SITEPKG_DIR=%{python_sitelib} \ -DSHARE_INSTALL_PREFIX=%{_datadir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ diff --git a/libproxy.changes b/libproxy.changes index 1cd010c..68e7474 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 2 09:38:47 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.4.6: + + Fixed a crash in the URL parser + + Fixed build issues with Visual Studio + + Updated the INSTALL file + + Install Python binding in prefix path if site-packages exists + ------------------------------------------------------------------- Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index e105e8e..b725b03 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy (Version 0.4.5) +# spec file for package libproxy (Version 0.4.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,7 +37,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.5 +Version: 0.4.6 Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} @@ -313,6 +313,7 @@ cmake \ -DLIB_INSTALL_DIR=%{_libdir} \ -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DPYTHON_SITEPKG_DIR=%{python_sitelib} \ -DSHARE_INSTALL_PREFIX=%{_datadir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ From bc079ecdd2131e0100c0f4718d6f1e9748f5d0d8356eef82b100079ab901eaa1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 3 Sep 2010 13:25:33 +0000 Subject: [PATCH 6/8] Refix branch OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=54 --- libproxy-plugins.spec | 9 +++++++-- libproxy.spec | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index ec78ee6..ebee3d0 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy (Version 0.4.6) +# spec file for package libproxy-plugins (Version 0.4.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_core_not_modules 0 %if 0%{?suse_version} %define have_mono 1 @@ -48,7 +49,7 @@ Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -License: LGPLv2.1+ +License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -181,6 +182,7 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios %if 0%{?have_mono} + %package -n libproxy-sharp License: GPLv2+ ; LGPLv2.1+ Summary: .Net bindings for libproxy @@ -405,6 +407,7 @@ make test %{python_sitelib}/*.py %if 0%{?have_mono} + %files -n libproxy-sharp %defattr(-, root, root) %{_assemblies_dir}/gac/libproxy-sharp @@ -412,6 +415,7 @@ make test %endif %if ! 0%{?windows} + %files -n perl-Net-Libproxy %defattr(-,root,root) %dir %{perl_vendorarch}/Net @@ -423,6 +427,7 @@ make test %else %if ! 0%{?windows} + %files -n libproxy1-config-kde4 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_kde4.so diff --git a/libproxy.spec b/libproxy.spec index b725b03..1ebe2eb 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_core_not_modules 1 %if 0%{?suse_version} %define have_mono 1 @@ -48,7 +49,7 @@ Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -License: LGPLv2.1+ +License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -181,6 +182,7 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios %if 0%{?have_mono} + %package -n libproxy-sharp License: GPLv2+ ; LGPLv2.1+ Summary: .Net bindings for libproxy @@ -405,6 +407,7 @@ make test %{python_sitelib}/*.py %if 0%{?have_mono} + %files -n libproxy-sharp %defattr(-, root, root) %{_assemblies_dir}/gac/libproxy-sharp @@ -412,6 +415,7 @@ make test %endif %if ! 0%{?windows} + %files -n perl-Net-Libproxy %defattr(-,root,root) %dir %{perl_vendorarch}/Net @@ -423,6 +427,7 @@ make test %else %if ! 0%{?windows} + %files -n libproxy1-config-kde4 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_kde4.so From c025adc5cad14a4135bb45712c615d7d3c741b21148301ba345aa31b78dad93d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 13 Sep 2010 09:41:16 +0000 Subject: [PATCH 7/8] Accepting request 47788 from GNOME:Factory checked in (request 47788) OBS-URL: https://build.opensuse.org/request/show/47788 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=55 --- libproxy-0.4.5.tar.bz2 | 3 +++ libproxy-0.4.6.tar.bz2 | 3 --- libproxy-plugins.changes | 9 --------- libproxy-plugins.spec | 5 ++--- libproxy.changes | 9 --------- libproxy.spec | 5 ++--- 6 files changed, 7 insertions(+), 27 deletions(-) create mode 100644 libproxy-0.4.5.tar.bz2 delete mode 100644 libproxy-0.4.6.tar.bz2 diff --git a/libproxy-0.4.5.tar.bz2 b/libproxy-0.4.5.tar.bz2 new file mode 100644 index 0000000..f934302 --- /dev/null +++ b/libproxy-0.4.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cccd9aff6304c7b687ef2364cd95475e6771d3920a521ad1b1d9c3cc70d13d1 +size 70452 diff --git a/libproxy-0.4.6.tar.bz2 b/libproxy-0.4.6.tar.bz2 deleted file mode 100644 index 8039232..0000000 --- a/libproxy-0.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9be19e35cec7de2159ad68b620665f02c25938d186697176125e9ad89220fb85 -size 71816 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 68e7474..1cd010c 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 2 09:38:47 CEST 2010 - dimstar@opensuse.org - -- Update to version 0.4.6: - + Fixed a crash in the URL parser - + Fixed build issues with Visual Studio - + Updated the INSTALL file - + Install Python binding in prefix path if site-packages exists - ------------------------------------------------------------------- Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index ebee3d0..0462a19 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy-plugins (Version 0.4.6) +# spec file for package libproxy-plugins (Version 0.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.6 +Version: 0.4.5 Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} @@ -315,7 +315,6 @@ cmake \ -DLIB_INSTALL_DIR=%{_libdir} \ -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ - -DPYTHON_SITEPKG_DIR=%{python_sitelib} \ -DSHARE_INSTALL_PREFIX=%{_datadir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ diff --git a/libproxy.changes b/libproxy.changes index 68e7474..1cd010c 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 2 09:38:47 CEST 2010 - dimstar@opensuse.org - -- Update to version 0.4.6: - + Fixed a crash in the URL parser - + Fixed build issues with Visual Studio - + Updated the INSTALL file - + Install Python binding in prefix path if site-packages exists - ------------------------------------------------------------------- Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index 1ebe2eb..fa1f13e 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy (Version 0.4.6) +# spec file for package libproxy (Version 0.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.6 +Version: 0.4.5 Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} @@ -315,7 +315,6 @@ cmake \ -DLIB_INSTALL_DIR=%{_libdir} \ -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ - -DPYTHON_SITEPKG_DIR=%{python_sitelib} \ -DSHARE_INSTALL_PREFIX=%{_datadir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ From 1304e161a6514ecae3dcded9f5528d6c8d46e21c3c7d563c04b97c1c69c7a61a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 13 Sep 2010 09:41:17 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/libproxy revision 23.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=4de3f351106b374ec32e66e495bb9d0f --- libproxy-0.4.5.tar.bz2 | 3 --- libproxy-0.4.6.tar.bz2 | 3 +++ libproxy-plugins.changes | 9 +++++++++ libproxy-plugins.spec | 5 +++-- libproxy.changes | 9 +++++++++ libproxy.spec | 5 +++-- 6 files changed, 27 insertions(+), 7 deletions(-) delete mode 100644 libproxy-0.4.5.tar.bz2 create mode 100644 libproxy-0.4.6.tar.bz2 diff --git a/libproxy-0.4.5.tar.bz2 b/libproxy-0.4.5.tar.bz2 deleted file mode 100644 index f934302..0000000 --- a/libproxy-0.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cccd9aff6304c7b687ef2364cd95475e6771d3920a521ad1b1d9c3cc70d13d1 -size 70452 diff --git a/libproxy-0.4.6.tar.bz2 b/libproxy-0.4.6.tar.bz2 new file mode 100644 index 0000000..8039232 --- /dev/null +++ b/libproxy-0.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be19e35cec7de2159ad68b620665f02c25938d186697176125e9ad89220fb85 +size 71816 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 1cd010c..68e7474 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 2 09:38:47 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.4.6: + + Fixed a crash in the URL parser + + Fixed build issues with Visual Studio + + Updated the INSTALL file + + Install Python binding in prefix path if site-packages exists + ------------------------------------------------------------------- Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 0462a19..ebee3d0 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy-plugins (Version 0.4.5) +# spec file for package libproxy-plugins (Version 0.4.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.5 +Version: 0.4.6 Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} @@ -315,6 +315,7 @@ cmake \ -DLIB_INSTALL_DIR=%{_libdir} \ -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DPYTHON_SITEPKG_DIR=%{python_sitelib} \ -DSHARE_INSTALL_PREFIX=%{_datadir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ diff --git a/libproxy.changes b/libproxy.changes index 1cd010c..68e7474 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 2 09:38:47 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.4.6: + + Fixed a crash in the URL parser + + Fixed build issues with Visual Studio + + Updated the INSTALL file + + Install Python binding in prefix path if site-packages exists + ------------------------------------------------------------------- Fri Aug 20 15:16:46 UTC 2010 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index fa1f13e..1ebe2eb 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,5 +1,5 @@ # -# spec file for package libproxy (Version 0.4.5) +# spec file for package libproxy (Version 0.4.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ Url: http://code.google.com/p/libproxy/ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.5 +Version: 0.4.6 Release: 1 %if 0%{?build_snapshot} %define _sourcename %{_name} @@ -315,6 +315,7 @@ cmake \ -DLIB_INSTALL_DIR=%{_libdir} \ -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DPYTHON_SITEPKG_DIR=%{python_sitelib} \ -DSHARE_INSTALL_PREFIX=%{_datadir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \