Accepting request 102423 from home:dimstar:branches:GNOME:Factory
Add trim patch... we released this as an update on 11.4 already,
then missed it in 12.1... again a maintenance update running...
include it in Factory now so we don't loose it again
OBS-URL: https://build.opensuse.org/request/show/102423
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=74
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
0051546fa4
commit
89699118c8
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 1 20:08:01 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- Add libproxy-trim-ignores.patch: Trim strings in ignore list.
|
||||
Fix bnc#739069.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 7 09:24:23 CET 2011 - meissner@suse.de
|
||||
|
||||
|
||||
@ -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 @@ Url: http://code.google.com/p/libproxy/
|
||||
%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 @@ Source99: baselibs.conf
|
||||
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 @@ libproxy offers the following features: * extremely small core
|
||||
%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 @@ happen in various cases.
|
||||
|
||||
|
||||
%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 @@ libproxy offers the following features: * extremely small core
|
||||
|
||||
|
||||
%package -n libproxy1
|
||||
License: GPLv2+ ; LGPLv2.1+
|
||||
Summary: Libproxy provides consistent proxy configuration to applications
|
||||
Group: System/Libraries
|
||||
|
||||
@ -146,7 +145,6 @@ libproxy offers the following features: * extremely small core
|
||||
* 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 @@ libproxy offers the following features: * extremely small core
|
||||
|
||||
|
||||
%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 @@ libproxy offers the following features: * extremely small core
|
||||
%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 @@ libproxy offers the following features: * extremely small core
|
||||
%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 @@ A module to extend libproxy with capabilities to query GNOME about
|
||||
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 @@ settings.
|
||||
|
||||
|
||||
%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 @@ WPAD/PAC script and have it find the correct proxy.
|
||||
|
||||
|
||||
%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 @@ 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}
|
||||
@ -316,6 +308,7 @@ about network configuration changes.
|
||||
%setup -q -n %{_sourcename}
|
||||
%patch0 -p0
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
mkdir build
|
||||
|
||||
%build
|
||||
|
||||
13
libproxy-trim-ignores.patch
Normal file
13
libproxy-trim-ignores.patch
Normal file
@ -0,0 +1,13 @@
|
||||
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<ignore_extension*>::iterator it=ignores.begin() ; it != ignores.end() && !ignored ; it++)
|
||||
ignored = ((*it)->ignore(*realurl, ignorestr));
|
||||
}
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 1 20:08:01 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- Add libproxy-trim-ignores.patch: Trim strings in ignore list.
|
||||
Fix bnc#739069.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 7 09:24:23 CET 2011 - meissner@suse.de
|
||||
|
||||
|
||||
@ -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 @@ Url: http://code.google.com/p/libproxy/
|
||||
%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 @@ Source99: baselibs.conf
|
||||
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 @@ libproxy offers the following features: * extremely small core
|
||||
%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 @@ happen in various cases.
|
||||
|
||||
|
||||
%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 @@ libproxy offers the following features: * extremely small core
|
||||
|
||||
|
||||
%package -n libproxy1
|
||||
License: GPLv2+ ; LGPLv2.1+
|
||||
Summary: Libproxy provides consistent proxy configuration to applications
|
||||
Group: System/Libraries
|
||||
|
||||
@ -146,7 +145,6 @@ libproxy offers the following features: * extremely small core
|
||||
* 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 @@ libproxy offers the following features: * extremely small core
|
||||
|
||||
|
||||
%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 @@ libproxy offers the following features: * extremely small core
|
||||
%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 @@ libproxy offers the following features: * extremely small core
|
||||
%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 @@ A module to extend libproxy with capabilities to query GNOME about
|
||||
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 @@ settings.
|
||||
|
||||
|
||||
%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 @@ WPAD/PAC script and have it find the correct proxy.
|
||||
|
||||
|
||||
%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 @@ 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}
|
||||
@ -316,6 +308,7 @@ about network configuration changes.
|
||||
%setup -q -n %{_sourcename}
|
||||
%patch0 -p0
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
mkdir build
|
||||
|
||||
%build
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user