Make --httpproxy and friends work again (RhBug:529214)

- macro fiddling to pass the macros set by --httpproxy etc popt aliases
  to the url helper
- ftp proxy and http proxy control the same thing (http proxy) now to
  keep things simple
- while at it, add %__urlhelper_localopts for local customization needs
  without having to override the entire __urlhelperopts macro

1 files changed, 5 insertions, 1 deletions

diff --git a/macros.in b/macros.in
index 75949a400..ae46fcbf6 100644
--- a/macros.in
+++ b/macros.in
@@ -1186,9 +1186,13 @@ done \
 %find_lang	%{_rpmconfigdir}/find-lang.sh %{buildroot}
 
 # Commands + opts to use for retrieving remote files
+# Proxy opts can be set through --httpproxy/--httpport popt aliases,
+# for any special local needs use %__urlhelper_localopts in system-wide
+# or per-user macro configuration.
 %__urlhelpercmd         @__CURL@
 %__urlhelperopts        --silent --show-error --fail --location -o
-%_urlhelper             %{__urlhelpercmd} %{__urlhelperopts}
+%__urlhelper_proxyopts   %{?_httpproxy:--proxy %{_httpproxy}%{?_httpport::%{_httpport}}}%{!?_httpproxy:%{nil}}
+%_urlhelper             %{__urlhelpercmd} %{?__urlhelper_localopts} %{?__urlhelper_proxyopts} %{__urlhelperopts}
 
 
 # \endverbatim