- up to 1.9.1, updated ac patch

Changed files:
    wget-ac.patch -> 1.10
    wget.spec -> 1.95

diff --git a/wget-ac.patch b/wget-ac.patch
index 48f4540250a15ef5ce5c331cdcdf0ee69400daf2..e5e5854eb389ddcc4a69696ae2781633e50b90da 100644 (file)
--- a/wget-ac.patch
+++ b/wget-ac.patch
@@ -1,6 +1,5 @@
-diff -urN wget-1.9-b5.org/configure.in wget-1.9-b5/configure.in
---- wget-1.9-b5.org/configure.in       2003-10-12 23:55:54.000000000 +0200
-+++ wget-1.9-b5/configure.in   2003-10-13 00:24:45.000000000 +0200
+--- wget-1.9.1/configure.in.orig       2003-11-08 20:15:35.000000000 +0100
++++ wget-1.9.1/configure.in    2003-11-16 11:46:45.947950144 +0100
 @@ -46,14 +46,14 @@
  dnl Get cannonical host
  dnl
@@ -39,7 +38,7 @@ diff -urN wget-1.9-b5.org/configure.in wget-1.9-b5/configure.in
  
  wget_need_md5=no
  
-@@ -382,7 +382,7 @@
+@@ -383,7 +383,7 @@
      dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
      dnl to use instead.
      AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
@@ -48,31 +47,33 @@ diff -urN wget-1.9-b5.org/configure.in wget-1.9-b5/configure.in
      AC_SUBST(SSL_INCLUDES)
      SSL_OBJ='gen_sslfunc$o'
      AC_SUBST(SSL_OBJ)
-@@ -424,7 +424,7 @@
-   dnl specific to the Solaris MD5 library.
-   if test x"$found_md5" = xno; then
-     AC_CHECK_LIB(md5, md5_calc, [
--      AC_DEFINE(HAVE_SOLARIS_MD5)
-+      AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
-       LIBS="-lmd5 $LIBS"
-       found_md5=yes
-     ])
-@@ -434,19 +434,19 @@
+@@ -431,7 +431,7 @@
+       AC_COMPILE_IFELSE([#include <md5.h>
+                         ], [
+         AC_MSG_RESULT(yes)
+-        AC_DEFINE(HAVE_SOLARIS_MD5)
++        AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
+         LIBS="-lmd5 $LIBS"
+         found_md5=yes
+         AC_MSG_NOTICE([using the Solaris MD5 implementation])
+@@ -443,7 +443,7 @@
    dnl implementation.
    if test x"$found_md5" = xno; then
      if test x"$ssl_success" = xyes; then
 -      AC_DEFINE(HAVE_OPENSSL_MD5)
 +      AC_DEFINE(HAVE_OPENSSL_MD5,,[Use OpenSSL MD5])
        found_md5=yes
+       AC_MSG_NOTICE([using the OpenSSL MD5 implementation])
      fi
-   fi
+@@ -451,13 +451,13 @@
  
    dnl If none of the above worked, use the one we ship with Wget.
    if test x"$found_md5" = xno; then
 -    AC_DEFINE(HAVE_BUILTIN_MD5)
 +    AC_DEFINE(HAVE_BUILTIN_MD5,,[Use builtin MD5])
-     found_md5=yes
      MD5_OBJ="$MD5_OBJ gnu-md5\$o"
+     found_md5=yes
+     AC_MSG_NOTICE([using the GNU MD5 implementation])
    fi
  fi
 -AC_DEFINE(HAVE_MD5)
@@ -80,7 +81,7 @@ diff -urN wget-1.9-b5.org/configure.in wget-1.9-b5/configure.in
  AC_SUBST(MD5_OBJ)
  
  dnl **********************************************************************
-@@ -530,7 +530,7 @@
+@@ -541,7 +541,7 @@
  dnl new language was added.
  
  dnl internationalization macros
@@ -89,7 +90,7 @@ diff -urN wget-1.9-b5.org/configure.in wget-1.9-b5/configure.in
  
  dnl
  dnl Find makeinfo.  If makeinfo is not found, look for Emacs.  If
-@@ -563,6 +563,4 @@
+@@ -574,6 +574,4 @@
  dnl Create output
  dnl
  AC_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in

diff --git a/wget.spec b/wget.spec
index 937a86bc8aef61bff3ead14d5d857ec4d97d87d2..7ebdfce4fa5eac372590ac39d757d119885cafad 100644 (file)
--- a/wget.spec
+++ b/wget.spec
@@ -7,12 +7,12 @@ Summary(ru):  
 Summary(uk):   õÔÉ̦ÔÁ ÄÌÑ ÏÔÒÉÍÁÎÎÑ ÆÁÊÌ¦× ÐÏ ÐÒÏÔÏËÏÌÁÍ HTTP ÔÁ FTP
 Summary(zh_CN):        [ͨѶ]¹¦ÄÜÇ¿´óµÄÏÂÔسÌÐò,Ö§³Ö¶ÏµãÐø´«
 Name:          wget
-Version:       1.9
-Release:       2
+Version:       1.9.1
+Release:       1
 License:       GPL
 Group:         Networking/Utilities
 Source0:       ftp://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.gz
-# Source0-md5: 18ac093db70801b210152dd69b4ef08a
+# Source0-md5: e6051f1e1487ec0ebfdbda72bedc70ad
 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
@@ -24,7 +24,7 @@ Patch5:               %{name}-wgetrc_path.patch
 Patch6:                %{name}-back-to-ipv4.patch
 Patch7:                %{name}-home_etc.patch
 URL:           http://sunsite.dk/wget/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: libtool
@@ -115,6 +115,8 @@ Proxy 
 %patch6 -p1
 %patch7 -p1
 
+rm -f doc/wget.info*
+
 %build
 %{__libtoolize}
 %{__gettextize}
@@ -127,9 +129,6 @@ Proxy 
 %{__make}
 tail -6 util/README >rmold.README
 
-cd doc
-makeinfo --force %{name}.texi; touch *
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}