packages: wget/wget.spec - cleanup, ac/am versions

[qboosh]

Author: qboosh                       Date: Fri Nov 12 08:16:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup, ac/am versions

---- Files affected:
packages/wget:
   wget.spec (1.149 -> 1.150) 

---- Diffs:

================================================================
Index: packages/wget/wget.spec
diff -u packages/wget/wget.spec:1.149 packages/wget/wget.spec:1.150
--- packages/wget/wget.spec:1.149	Wed Jul 21 10:42:11 2010
+++ packages/wget/wget.spec	Fri Nov 12 09:16:17 2010
@@ -15,7 +15,7 @@
 Name:		wget
 Version:	1.12
 Release:	3
-License:	GPL v3+
+License:	GPL v3+ with OpenSSL exception
 Group:		Networking/Utilities
 Source0:	http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.bz2
 # Source0-md5:	308a5476fc096a8a525d07279a6f6aa3
@@ -28,9 +28,9 @@
 Patch3:		%{name}-home_etc.patch
 Patch5:		%{name}-ssl-certs.patch
 URL:		http://www.gnu.org/software/wget/
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
-BuildRequires:	gettext-devel
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	libtool
 BuildRequires:	openssl-devel >= 0.9.7m
 BuildRequires:	perl-devel
@@ -117,11 +117,10 @@
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
-rm -f doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion
+%{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion
 
 %build
 %{__libtoolize}
-cp -f /usr/share/automake/config.* .
 %{__gettextize}
 %{__aclocal} -I m4
 %{__autoheader}
@@ -139,7 +138,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GETTEXT_PACKAGE=wget
 
-install -p util/rmold.pl		$RPM_BUILD_ROOT%{_bindir}/rmold
+install -p util/rmold.pl $RPM_BUILD_ROOT%{_bindir}/rmold
 cp -a doc/sample.wgetrc	$RPM_BUILD_ROOT%{_sysconfdir}/wgetrc
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -166,7 +165,7 @@
 %{_mandir}/man1/wget.1*
 %{_mandir}/hu/man1/wget.1*
 %{_mandir}/pl/man1/wget.1*
-%{_infodir}/*.info*
+%{_infodir}/wget.info*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -174,6 +173,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.150  2010/11/12 08:16:17  qboosh
+- cleanup, ac/am versions
+
 Revision 1.149  2010/07/21 08:42:11  glen
 - patch to check subjectAltNames from certificates, patch from savannah; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wget/wget.spec?r1=1.149&r2=1.150&f=u