From 415a56c43ed651ba3631715c88c8d07e65534923b23b6fa1abcdf1befe4a9601 Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Wed, 21 Mar 2012 20:33:22 +0000
Subject: [PATCH] Accepting request 110487 from
 home:dimstar:branches:network:utilities

Fix bnc#753242 - wget produces confusing output when not using --no-proxy

OBS-URL: https://build.opensuse.org/request/show/110487
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=24
---
 wget-libproxy.patch |  8 ++++----
 wget.changes        |  7 +++++++
 wget.spec           | 11 ++++++-----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/wget-libproxy.patch b/wget-libproxy.patch
index 95f5a2d..e1b4217 100644
--- a/wget-libproxy.patch
+++ b/wget-libproxy.patch
@@ -62,23 +62,23 @@ Index: src/retr.c
 +	pxProxyFactory *pf = px_proxy_factory_new();
 +        if (!pf)
 +        {
-+		logprintf (LOG_VERBOSE, _("Allocating memory for libproxy failed"));
++		debug_logprintf (_("Allocating memory for libproxy failed"));
 +               return NULL;
 +        }
 +	int i; 
 +	char direct[] = "direct://";
 +
-+	logprintf (LOG_VERBOSE, _("asking libproxy about url '%s'\n"), u->url);
++	debug_logprintf (_("asking libproxy about url '%s'\n"), u->url);
 +	char **proxies = px_proxy_factory_get_proxies(pf, u->url);
 +	if (proxies[0])
 +	{
 +          char *check = NULL;
 +          asprintf(&check , "%s", proxies[0]);
-+	    logprintf (LOG_VERBOSE, _("libproxy suggest to use '%s'\n"), check);
++	    debug_logprintf (_("libproxy suggest to use '%s'\n"), check);
 +  	    if(strcmp(check ,direct) != 0)
 +	    {
 +		asprintf(&proxy , "%s", proxies[0]);
-+  	        logprintf (LOG_VERBOSE, _("case 2: libproxy setting to use '%s'\n"), proxy);
++  	        debug_logprintf (_("case 2: libproxy setting to use '%s'\n"), proxy);
 +	    }
 +	}
 +	for(i=0;proxies[i];i++) free(proxies[i]);
diff --git a/wget.changes b/wget.changes
index 2793429..0ee0212 100644
--- a/wget.changes
+++ b/wget.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 21 19:44:53 UTC 2012 - dimstar@opensuse.org
+
+- Adjust wget-libproxy.patch: give debug output only when
+  opt.debug is set to non-zero values, so when -d is specified.
+  Fix bnc#753242.
+
 -------------------------------------------------------------------
 Fri Dec  2 15:59:32 UTC 2011 - coolo@suse.com
 
diff --git a/wget.spec b/wget.spec
index 6890290..b667a83 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package wget
 #
-# 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
@@ -15,13 +15,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           wget
 Version:        1.13.4
 Release:        0
-License:        GPL-3.0+
 Summary:        A Tool for Mirroring FTP and HTTP Servers
-Url:            http://www.gnu.org/software/wget/
+License:        GPL-3.0+
 Group:          Productivity/Networking/Web/Utilities
+Url:            http://www.gnu.org/software/wget/
 Source:         %name-%version.tar.bz2
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch0:         wgetrc.patch
@@ -32,10 +33,10 @@ BuildRequires:  libpng-devel
 %if 0%{suse_version} > 1110
 BuildRequires:  libproxy-devel
 %endif
-BuildRequires:  openssl-devel
 BuildRequires:  automake
-BuildRequires:  pkg-config
 BuildRequires:  libidn-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkg-config
 PreReq:         %install_info_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build