- merge from DEVEL branch

Changed files:
    automake.spec -> 1.71

diff --git a/automake.spec b/automake.spec
index 76b46b1330145cec298aaddd5b0e231d6e6c41cf..2ff7cabc35a27448b7b7aa33d9c1d435b07eef04 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -9,8 +9,9 @@ Summary(ru):    GNU automake - 
 Summary(tr):   Makefile yapýlandýrma araçlarý
 Summary(uk):   GNU automake - ¦ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ Á×ÔÏÍÁÔÉÞÎϧ ÇÅÎÅÒÁæ§ Makefile'¦×
 Name:          automake
-Version:       1.6.3
-Release:       2
+Version:       1.7
+Release:       1
+Epoch:         1
 License:       GPL
 Group:         Development/Building
 Source0:       ftp://sourceware.cygnus.com/pub/automake/%{name}-%{version}.tar.bz2
@@ -20,12 +21,12 @@ Patch2:             %{name}-regex.m4.patch
 Patch3:                %{name}-no_versioned_dir.patch
 Patch4:                %{name}-libtool.patch
 URL:           http://sourceware.cygnus.com/automake/
-BuildRequires: autoconf >= 2.52
+BuildRequires: autoconf >= 2.54
 BuildRequires: rpm-perlprov
 Requires(pre): fileutils
 Requires:      perl
 Requires:      perl(File::Glob)
-Conflicts:     autoconf < 2.52
+Conflicts:     autoconf < 2.54
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildArch:     noarch
 
@@ -104,6 +105,8 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
 install aclocal.1 automake.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir*
+
 %clean
 rm -rf $RPM_BUILD_ROOT