diff --git a/wget-1.14-libproxy.patch b/wget-1.16-libproxy.patch similarity index 86% rename from wget-1.14-libproxy.patch rename to wget-1.16-libproxy.patch index ea5a1d5..17566e6 100644 --- a/wget-1.14-libproxy.patch +++ b/wget-1.16-libproxy.patch @@ -25,19 +25,6 @@ Index: configure.ac dnl ********************************************************************** dnl Checks for IPv6 dnl ********************************************************************** -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -37,7 +37,7 @@ endif - - # The following line is losing on some versions of make! - DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" --LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) -+LIBS = @LIBICONV@ @LIBINTL@ @libproxy_LIBS@ @LIBS@ $(LIB_CLOCK_GETTIME) - - EXTRA_DIST = css.l css.c css_.c build_info.c.in - Index: src/retr.c =================================================================== --- src/retr.c.orig @@ -94,3 +81,14 @@ Index: src/retr.c /* Handle shorthands. `rewritten_storage' is a kludge to allow getproxy() to return static storage. */ +--- src/Makefile.am.orig 2014-11-03 22:30:40.624963635 +0100 ++++ src/Makefile.am 2014-11-03 22:31:24.029964347 +0100 +@@ -37,7 +37,7 @@ + + # The following line is losing on some versions of make! + DEFS += -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" +-LIBS += $(LIBICONV) $(LIBINTL) $(LIB_CLOCK_GETTIME) ++LIBS += $(LIBICONV) $(LIBINTL) @libproxy_LIBS@ $(LIB_CLOCK_GETTIME) + + EXTRA_DIST = css.l css.c css_.c build_info.c.in + diff --git a/wget.spec b/wget.spec index 08ad56d..6a30188 100644 --- a/wget.spec +++ b/wget.spec @@ -1,7 +1,7 @@ %define with_ssl 1 Name: wget -Version: 1.15 +Version: 1.16 Release: 1mamba Epoch: 1 Summary: A utility for retrieving files using the HTTP or FTP protocols @@ -18,7 +18,7 @@ Patch3: %{name}-1.11.4-logstdout.patch Patch4: %{name}-1.9.1-can-2004-1487_1488.patch Patch5: %{name}-1.10-ctype.patch Patch6: %{name}-1.10.2-CVE-2006-6719.patch -Patch7: wget-1.14-libproxy.patch +Patch7: wget-1.16-libproxy.patch License: GPL Requires(post): %{__install_info} ## AUTOBUILDREQ-BEGIN @@ -49,7 +49,7 @@ Wget features include the ability to work in the background while you're logged #%patch0 -p1 -b .msec %patch1 -p1 -b .passive_ftp.patch #%patch2 -p1 -b .etc -%patch3 -p1 -b .logstdout +#%patch3 -p1 -b .logstdout #%patch4 -p1 -b .can-2004-1487_1488 #%patch5 -p1 -b .ctype #%patch6 -p1 -b .cve-2006-6719 @@ -92,6 +92,9 @@ exit 0 %doc AUTHORS COPYING src/ChangeLog MAILING-LIST NEWS README %changelog +* Mon Nov 03 2014 Automatic Build System 1.16-1mamba +- automatic version update by autodist + * Sun Jan 19 2014 Automatic Build System 1.15-1mamba - automatic version update by autodist