- real update for 1.10.1

[packages/wget.git] / wget.spec

diff --git a/wget.spec b/wget.spec
index 426a9403966d8e05b387565bd0aa8c34fb361b6a..1ac2c37ce30cd3cd5e1fdcbede9846da3b0131f0 100644 (file)
--- a/wget.spec
+++ b/wget.spec
@@ -1,5 +1,3 @@
-%bcond_with fancy      pornografic progress bar
-
 Summary:       A utility for retrieving files using the HTTP or FTP protocols
 Summary(es):   Cliente en línea de comando para bajar archivos WWW/FTP con recursión opcional
 Summary(fr):   Un utilitaire pour recuperer des fichiers en utilisant les protocoles HTTP ou FTP
@@ -9,29 +7,26 @@ Summary(ru):  
 Summary(uk):   õÔÉ̦ÔÁ ÄÌÑ ÏÔÒÉÍÁÎÎÑ ÆÁÊÌ¦× ÐÏ ÐÒÏÔÏËÏÌÁÍ HTTP ÔÁ FTP
 Summary(zh_CN):        [ͨѶ]¹¦ÄÜÇ¿´óµÄÏÂÔسÌÐò,Ö§³Ö¶ÏµãÐø´«
 Name:          wget
-Version:       1.9.1
-Release:       3
+Version:       1.10
+Release:       2
 License:       GPL
 Group:         Networking/Utilities
 Source0:       ftp://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz
-# Source0-md5: e6051f1e1487ec0ebfdbda72bedc70ad
+# Source0-md5: caddc199d2cb31969e32b19fd365b0c5
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: d8b2b56ec7461606c22edbafaf8a418f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-ac.patch
-Patch2:                %{name}-m4.patch
-Patch3:                %{name}-lame_fs.patch
-Patch4:                %{name}-pl.patch
-Patch5:                %{name}-wgetrc_path.patch
-Patch6:                %{name}-back-to-ipv4.patch
-Patch7:                %{name}-home_etc.patch
-Patch8:                %{name}-strptime.patch
-Patch9:                %{name}-porn.patch
-Patch10:       %{name}-nonperm.patch
+Patch2:                %{name}-pl.patch
+Patch3:                %{name}-wgetrc_path.patch
+Patch4:                %{name}-home_etc.patch
+Patch5:                %{name}-strptime.patch
+Patch6:                %{name}-segv.patch
 URL:           http://sunsite.dk/wget/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: gettext-devel
+BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: texinfo
@@ -39,6 +34,8 @@ BuildRequires:        perl-devel
 Provides:      webclient
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoreqfiles         %{_bindir}/rmold
+
 %description
 GNU Wget is a file retrieval utility which can use either the HTTP or
 FTP protocols. Wget features include the ability to work in the
@@ -114,25 +111,24 @@ Proxy 
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%{?with_fancy:%patch9 -p1}
-%patch10 -p1
-rm -f doc/wget.info*
+rm -f doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion
+
+mv -f po/{no,nb}.po
 
 %build
+mv ac{local,include}.m4
 %{__libtoolize}
 %{__gettextize}
+intltoolize --copy --force
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %configure \
-       --with-ssl \
-       --enable-ipv6
+       --with-ssl
 %{__make}
 tail -n 6 util/README >rmold.README
 
@@ -141,12 +137,14 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       GETTEXT_PACKAGE=wget
 
 install util/rmold.pl          $RPM_BUILD_ROOT%{_bindir}/rmold
 install doc/sample.wgetrc      $RPM_BUILD_ROOT%{_sysconfdir}/wgetrc
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+rm -f $RPM_BUILD_ROOT%{_mandir}/README*
 
 %find_lang %{name}