Hello community,
here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2012-02-03 10:23:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libproxy (Old)
and /work/SRC/openSUSE:Factory/.libproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libproxy", Maintainer is "gnome-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2012-01-06 11:45:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2012-02-03 10:23:49.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 1 20:08:01 UTC 2012 - dimstar@opensuse.org
+
+- Add libproxy-trim-ignores.patch: Trim strings in ignore list.
+ Fix bnc#739069.
+
+-------------------------------------------------------------------
libproxy.changes: same change
New:
----
libproxy-trim-ignores.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libproxy-plugins.spec ++++++
--- /var/tmp/diff_new_pack.Nf2DEn/_old 2012-02-03 10:23:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Nf2DEn/_new 2012-02-03 10:23:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libproxy-plugins
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -31,10 +31,11 @@
%define _name libproxy
Name: libproxy-plugins
-Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to applications
+License: GPL-2.0+ ; LGPL-2.1+
+Group: System/Libraries
Version: 0.4.7
-Release: 5
+Release: 0
%if 0%{?build_snapshot}
%define _sourcename %{_name}
%else
@@ -48,7 +49,8 @@
Patch0: libproxy-javascriptcoregtk.patch
# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz@opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn.
Patch1: libproxy-mozjs185.patch
-License: GPLv2+ ; LGPLv2.1+
+# PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar@opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821.
+Patch2: libproxy-trim-ignores.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -102,7 +104,6 @@
%if %build_core_not_modules
%package tools
-License: GPLv2+ ; LGPLv2.1+
Summary: A simple application using libproxy
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -114,7 +115,6 @@
%package devel
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications - Development Files
Group: Development/Libraries/C and C++
Requires: libproxy1 = %{version}
@@ -131,7 +131,6 @@
%package -n libproxy1
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications
Group: System/Libraries
@@ -146,7 +145,6 @@
* a standard way of dealing with proxy settings across all scenarios
%package -n python-libproxy
-License: GPLv2+ ; LGPLv2.1+
Summary: Python bindings for libproxy
Group: System/Libraries
%if 0%{?suse_version} > 1110
@@ -167,7 +165,6 @@
%package -n perl-Net-Libproxy
-License: GPLv2+ ; LGPLv2.1+
Summary: Perl bindings for libproxy
Group: Development/Libraries/Perl
Requires: libproxy1 = %{version}
@@ -187,7 +184,6 @@
%if 0%{?have_mono}
%package -n libproxy-sharp
-License: GPLv2+ ; LGPLv2.1+
Summary: .Net bindings for libproxy
Group: Development/Languages/Mono
Requires: libproxy1 = %{version}
@@ -210,13 +206,13 @@
%package -n libproxy1-config-gnome
Summary: Libproxy module for GNOME configuration
+Group: System/Libraries
%else
%package -n libproxy1-config-gnome3
Summary: Libproxy module for GNOME3 configuration
-%endif
-License: GPLv2+ ; LGPLv2.1+
Group: System/Libraries
+%endif
Requires: libproxy1 = %{version}
%if 0%{?suse_version}
Recommends: libproxy1-pacrunner = %{version}
@@ -244,7 +240,6 @@
proxy settings.
%package -n libproxy1-config-kde4
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for KDE configuration
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -263,7 +258,6 @@
%package -n libproxy1-pacrunner-mozjs
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -279,7 +273,6 @@
%package -n libproxy1-pacrunner-webkit
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -298,7 +291,6 @@
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}
@@ -316,6 +308,7 @@
%setup -q -n %{_sourcename}
%patch0 -p0
%patch1 -p1
+%patch2 -p0
mkdir build
%build
++++++ libproxy.spec ++++++
--- /var/tmp/diff_new_pack.Nf2DEn/_old 2012-02-03 10:23:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Nf2DEn/_new 2012-02-03 10:23:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libproxy
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -31,10 +31,11 @@
%define _name libproxy
Name: libproxy
-Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to applications
+License: GPL-2.0+ ; LGPL-2.1+
+Group: System/Libraries
Version: 0.4.7
-Release: 5
+Release: 0
%if 0%{?build_snapshot}
%define _sourcename %{_name}
%else
@@ -48,7 +49,8 @@
Patch0: libproxy-javascriptcoregtk.patch
# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz@opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn.
Patch1: libproxy-mozjs185.patch
-License: GPLv2+ ; LGPLv2.1+
+# PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar@opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821.
+Patch2: libproxy-trim-ignores.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -102,7 +104,6 @@
%if %build_core_not_modules
%package tools
-License: GPLv2+ ; LGPLv2.1+
Summary: A simple application using libproxy
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -114,7 +115,6 @@
%package devel
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications - Development Files
Group: Development/Libraries/C and C++
Requires: libproxy1 = %{version}
@@ -131,7 +131,6 @@
%package -n libproxy1
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy provides consistent proxy configuration to applications
Group: System/Libraries
@@ -146,7 +145,6 @@
* a standard way of dealing with proxy settings across all scenarios
%package -n python-libproxy
-License: GPLv2+ ; LGPLv2.1+
Summary: Python bindings for libproxy
Group: System/Libraries
%if 0%{?suse_version} > 1110
@@ -167,7 +165,6 @@
%package -n perl-Net-Libproxy
-License: GPLv2+ ; LGPLv2.1+
Summary: Perl bindings for libproxy
Group: Development/Libraries/Perl
Requires: libproxy1 = %{version}
@@ -187,7 +184,6 @@
%if 0%{?have_mono}
%package -n libproxy-sharp
-License: GPLv2+ ; LGPLv2.1+
Summary: .Net bindings for libproxy
Group: Development/Languages/Mono
Requires: libproxy1 = %{version}
@@ -210,13 +206,13 @@
%package -n libproxy1-config-gnome
Summary: Libproxy module for GNOME configuration
+Group: System/Libraries
%else
%package -n libproxy1-config-gnome3
Summary: Libproxy module for GNOME3 configuration
-%endif
-License: GPLv2+ ; LGPLv2.1+
Group: System/Libraries
+%endif
Requires: libproxy1 = %{version}
%if 0%{?suse_version}
Recommends: libproxy1-pacrunner = %{version}
@@ -244,7 +240,6 @@
proxy settings.
%package -n libproxy1-config-kde4
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module for KDE configuration
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -263,7 +258,6 @@
%package -n libproxy1-pacrunner-mozjs
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -279,7 +273,6 @@
%package -n libproxy1-pacrunner-webkit
-License: GPLv2+ ; LGPLv2.1+
Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine
Group: System/Libraries
Requires: libproxy1 = %{version}
@@ -298,7 +291,6 @@
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}
@@ -316,6 +308,7 @@
%setup -q -n %{_sourcename}
%patch0 -p0
%patch1 -p1
+%patch2 -p0
mkdir build
%build
++++++ libproxy-trim-ignores.patch ++++++
Index: libproxy/proxy.cpp
===================================================================
--- libproxy/proxy.cpp (revision 819)
+++ libproxy/proxy.cpp (working copy)
@@ -268,6 +268,7 @@
if (next == string::npos) next = confign.length();
if (next > (i+1)) {
string ignorestr = confign.substr (i, next - i);
+ ignorestr = ignorestr.substr(ignorestr.find_first_not_of(" \t\n"), ignorestr.find_last_not_of(" \t\n")+1);
for (vector