diff --git a/.cvsignore b/.cvsignore index 6809b58..65e9ab5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wget-1.11.2.tar.bz2 +wget-1.11.3.tar.bz2 diff --git a/sources b/sources index 9e422eb..1575158 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -730d2687231934f51e47f6f85260b2d3 wget-1.11.2.tar.bz2 +6351b5777b0f0c94b5148899b6150135 wget-1.11.3.tar.bz2 diff --git a/wget-1.10.2-218211.patch b/wget-1.10.2-218211.patch deleted file mode 100644 index 2f895d0..0000000 --- a/wget-1.10.2-218211.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- wget-1.10.2/src/ftp.c.218211 2006-12-07 13:51:06.000000000 +0100 -+++ wget-1.10.2/src/ftp.c 2006-12-07 13:51:25.000000000 +0100 -@@ -1315,6 +1315,7 @@ - - con->target = lf; - err = ftp_loop_internal (u, NULL, con); -+ lf = con->target; - con->target = old_target; - - if (err == RETROK) diff --git a/wget-rh-modified.patch b/wget-rh-modified.patch index 9563813..2638a0f 100644 --- a/wget-rh-modified.patch +++ b/wget-rh-modified.patch @@ -2,5 +2,5 @@ diff -up wget-1.11.1/src/version.c.rh1 wget-1.11.1/src/version.c --- wget-1.11.1/src/version.c.rh1 2008-03-31 11:27:06.000000000 +0200 +++ wget-1.11.1/src/version.c 2008-03-31 11:27:22.000000000 +0200 @@ -1 +1 @@ --char *version_string = "1.11.2"; -+char *version_string = "1.11.2 (Red Hat modified)"; +-char *version_string = "1.11.3"; ++char *version_string = "1.11.3 (Red Hat modified)"; diff --git a/wget.spec b/wget.spec index b7cc962..d16cbe1 100644 --- a/wget.spec +++ b/wget.spec @@ -1,6 +1,6 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols Name: wget -Version: 1.11.2 +Version: 1.11.3 Release: 1%{?dist} License: GPLv3+ Group: Applications/Internet @@ -10,7 +10,6 @@ Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.bz2 Patch1: wget-rh-modified.patch Patch2: wget-1.11-path.patch Patch3: wget-1.10.1-helpfix.patch -Patch4: wget-1.10.2-218211.patch Provides: webclient Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -31,7 +30,6 @@ support for Proxy servers, and configurability. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 #cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/de.po #chmod a+x doc/texi2pod.pl @@ -70,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/* %changelog +* Wed Jun 04 2008 Karsten Hopp 1.11.3-1 +- wget-1.11.3, downgrades the combination of the -N and -O options + to a warning instead of an error + * Fri May 09 2008 Karsten Hopp 1.11.2-1 - wget-1.11.2, fixes #179962