From 16e74c6b19ceade424a198e80c44f64ea9e840fb06a1a141440b4b1a33686544 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:32:14 +0000 Subject: [PATCH] converted link to branch OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=33 --- libproxy-plugins.changes | 5 +++++ libproxy-plugins.spec | 29 +++++++++++++++-------------- libproxy.changes | 5 +++++ libproxy.spec | 33 +++++++++++++++++---------------- 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 353a5dc..13d0120 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 5 17:17:30 CET 2010 - jengelh@medozas.de + +- Package baselibs.conf + ------------------------------------------------------------------- Thu Oct 8 19:34:24 UTC 2009 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 2fc1db1..d4d4348 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -1,7 +1,7 @@ # # spec file for package libproxy-plugins (Version 0.3.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,9 +34,10 @@ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications Version: 0.3.1 -Release: 1 +Release: 2 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 -License: LGPL v2.1 or later +Source99: baselibs.conf +License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config BuildRequires: python-devel @@ -107,7 +108,7 @@ libproxy offers the following features: * extremely small core %package -n libproxy0 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy provides consistent proxy configuration to applications Group: System/Libraries @@ -126,7 +127,7 @@ libproxy offers the following features: * extremely small core %package -n python-libproxy -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Python bindings for libproxy Group: System/Libraries Requires: libproxy0 = %{version} @@ -147,7 +148,7 @@ libproxy offers the following features: * extremely small core %package -n libproxy-sharp -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: .Net bindings for libproxy Group: Development/Languages/Mono Requires: libproxy0 = %{version} @@ -169,7 +170,7 @@ libproxy offers the following features: * extremely small core %else %package -n libproxy0-config-gnome -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for GNOME configuration Group: System/Libraries Requires: libproxy0 = %{version} @@ -187,7 +188,7 @@ proxy settings. %package -n libproxy0-config-kde4 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration Group: System/Libraries Requires: libproxy0 = %{version} @@ -206,7 +207,7 @@ settings. %package -n libproxy0-pacrunner-mozjs -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy0 = %{version} @@ -224,7 +225,7 @@ WPAD/PAC script and have it find the correct proxy. %package -n libproxy0-pacrunner-webkit -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy0 = %{version} @@ -242,7 +243,7 @@ WPAD/PAC script and have it find the correct proxy. %package -n libproxy0-networkmanager -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries Requires: libproxy0 = %{version} @@ -256,7 +257,7 @@ about network configuration changes. %package -n libproxy0-config-wpad -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for WPAD autofallback Group: System/Libraries Requires: libproxy0 = %{version} @@ -270,7 +271,7 @@ This might not be wanted in tight security environments. %package -n libproxy0-wpad-dns -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for WPAD Autofallback Group: System/Libraries Requires: libproxy0 = %{version} @@ -285,7 +286,7 @@ The module is needed whenever automatic proxy configuration is used. %package -n libproxy0-wpad-dns-devolution -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for WPAD Autofallback Group: System/Libraries Requires: libproxy0 = %{version} diff --git a/libproxy.changes b/libproxy.changes index 353a5dc..13d0120 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 5 17:17:30 CET 2010 - jengelh@medozas.de + +- Package baselibs.conf + ------------------------------------------------------------------- Thu Oct 8 19:34:24 UTC 2009 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index cb612d1..6031ddc 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -1,7 +1,7 @@ # # spec file for package libproxy (Version 0.3.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,9 +34,10 @@ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications Version: 0.3.1 -Release: 1 +Release: 2 Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 -License: LGPL v2.1 or later +Source99: baselibs.conf +License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config BuildRequires: python-devel @@ -75,7 +76,7 @@ libproxy offers the following features: * extremely small core %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} @@ -87,7 +88,7 @@ happen in various cases. %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} @@ -107,7 +108,7 @@ libproxy offers the following features: * extremely small core %package -n libproxy0 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy provides consistent proxy configuration to applications Group: System/Libraries @@ -126,7 +127,7 @@ libproxy offers the following features: * extremely small core %package -n python-libproxy -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Python bindings for libproxy Group: System/Libraries Requires: libproxy0 = %{version} @@ -147,7 +148,7 @@ libproxy offers the following features: * extremely small core %package -n libproxy-sharp -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: .Net bindings for libproxy Group: Development/Languages/Mono Requires: libproxy0 = %{version} @@ -169,7 +170,7 @@ libproxy offers the following features: * extremely small core %else %package -n libproxy0-config-gnome -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for GNOME configuration Group: System/Libraries Requires: libproxy0 = %{version} @@ -187,7 +188,7 @@ proxy settings. %package -n libproxy0-config-kde4 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration Group: System/Libraries Requires: libproxy0 = %{version} @@ -206,7 +207,7 @@ settings. %package -n libproxy0-pacrunner-mozjs -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy0 = %{version} @@ -224,7 +225,7 @@ WPAD/PAC script and have it find the correct proxy. %package -n libproxy0-pacrunner-webkit -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy0 = %{version} @@ -242,7 +243,7 @@ WPAD/PAC script and have it find the correct proxy. %package -n libproxy0-networkmanager -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries Requires: libproxy0 = %{version} @@ -256,7 +257,7 @@ about network configuration changes. %package -n libproxy0-config-wpad -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for WPAD autofallback Group: System/Libraries Requires: libproxy0 = %{version} @@ -270,7 +271,7 @@ This might not be wanted in tight security environments. %package -n libproxy0-wpad-dns -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for WPAD Autofallback Group: System/Libraries Requires: libproxy0 = %{version} @@ -285,7 +286,7 @@ The module is needed whenever automatic proxy configuration is used. %package -n libproxy0-wpad-dns-devolution -License: GPL v2 or later ; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for WPAD Autofallback Group: System/Libraries Requires: libproxy0 = %{version}