From bdfaf02d01afc160cca6ca33861849f2bc31631b Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 14:17:36 +0000
Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20wget-1.?=
 =?UTF-8?q?7-1.src.rpm=20Wed=20Jun=2006=202001=20Trond=20Eivind=20Glomsr?=
 =?UTF-8?q?=F8d=20<teg@redhat.com>=20-=201.7=20-=20Require=20perl=20for=20?=
 =?UTF-8?q?building=20(to=20get=20man=20pages)=20-=20Don't=20include=20the?=
 =?UTF-8?q?=20Japanese=20po=20file,=20it's=20now=20included=20-=20Use=20%{?=
 =?UTF-8?q?=5Ftmppath}=20-=20no=20patches=20necessary=20-=20Make=20/etc/wg?=
 =?UTF-8?q?etrc=20noreplace=20-=20More=20docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cvsignore |  2 +-
 sources    |  2 +-
 wget.spec  | 45 ++++++++++++++++++---------------------------
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4e697d1..1d44046 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wget-1.6.tar.gz
+wget-1.7.tar.gz
diff --git a/sources b/sources
index 604eeb8..a4dab00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5c9d3894ebf1bef3555c01376392c0d  wget-1.6.tar.gz
+c911a6b937c0a18757d3211fb62831de  wget-1.7.tar.gz
diff --git a/wget.spec b/wget.spec
index aa09ccf..cb3e1d0 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,22 +1,19 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Name: wget
-Version: 1.6
-Release: 2a
+Version: 1.7
+Release: 1
 Copyright: GPL
 Group: Applications/Internet
 Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz 
 Source2: wget-1.5.3-ko.po
-Source3: wget-1.5.3-ja.po
-Patch0: wget-1.5.0-man.patch
+# The symlink patch no longer seems to be necesarry... at least
+# I couldn't reproduce the original problem with 1.7. Keeping it
+# around for some time still, just in case... 2001-06-06, teg@redhat.com
 Patch1: wget-1.6-symlink.patch
-Patch2: wget-1.6-locale.patch
-Patch3: wget-1.6-escape.patch
-Patch4: wget-1.6-nopo.patch
-Patch5: wget-1.6-varargs.patch
-Patch6: wget-1.6-socklen.patch
 Provides: webclient
 Prereq: /sbin/install-info
-BuildRoot: /var/tmp/%{name}-root
+BuildRequires: perl
+BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 GNU Wget is a file retrieval utility which can use either the HTTP or
@@ -32,19 +29,11 @@ FTP, or if you need a utility for mirroring web sites or FTP directories.
 
 %prep
 %setup -q
-%patch0 -p1 -b .man
-%patch1 -p1 -b .symlink
-%patch2 -p1 -b .locale
-%patch3 -p1 -b .escape
-%patch4 -p1
-%patch5 -p1 -b .va
-%patch6 -p1 -b .len
 
 cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/ko.po
-cp %{SOURCE3} $RPM_BUILD_DIR/wget-%{version}/po/ja.po
 
 %build
-%configure --sysconfdir=/etc
+%configure 
 make
 
 %install
@@ -66,19 +55,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS MAILING-LIST NEWS README INSTALL doc/ChangeLog
-%config /etc/wgetrc
+%doc AUTHORS MAILING-LIST NEWS README PATCHES README.cvs TODO
+%config(noreplace) /etc/wgetrc
 %{_mandir}/man1/wget.*
 %{_bindir}/wget
 %{_infodir}/*
 
 %changelog
-* Tue May 22 2001 Oliver Paukstadt <oliver.paukstadt@millenux.com>
-- fixed varargs bug
-- fixed socklen_t/size_t/int-pointer-casts
-
-* Fri May  4 2001 Oliver Paukstadt <oliver.paukstadt@millenux.com>
-- ported to IBM zSeries (s390x, 64 bit)
+* Wed Jun  6 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 1.7
+- Require perl for building (to get man pages)
+- Don't include the Japanese po file, it's now included
+- Use %%{_tmppath}
+- no patches necessary
+- Make /etc/wgetrc noreplace
+- More docs
 
 * Tue Jan 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Norwegian isn't a iso-8859-2 locale, neither is Danish.