- use output_flag for CCASCOMPILE; seems to fix .S-in-subdir problem found in inkscape

[packages/automake.git] / automake.spec

diff --git a/automake.spec b/automake.spec
index b5237662dedeea4f0f5b20ddd15842893f480f84..6039e5d62fd76d9c68d9b29954c8f50ee75f6181 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -10,25 +10,25 @@ Summary(ru):        GNU automake - 
 Summary(tr):   Makefile yapýlandýrma araçlarý
 Summary(uk):   GNU automake - ¦ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ Á×ÔÏÍÁÔÉÞÎϧ ÇÅÎÅÒÁæ§ Makefile'¦×
 Name:          automake
-Version:       1.7.8
+Version:       1.9.4
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Development/Building
-Source0:       ftp://sources.redhat.com/pub/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5: 8a934bdfb1d30cbeeb5f91af0970017c
+Source0:       ftp://sources.redhat.com/pub/automake/%{name}-%{version}.tar.bz2
+# Source0-md5: 1b3a680fc5e046b275dd2456426f8a9e
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
-Patch2:                %{name}-regex.m4.patch
-Patch3:                %{name}-no_versioned_dir.patch
+Patch2:                %{name}-no_versioned_dir.patch
 URL:           http://sources.redhat.com/automake/
-BuildRequires: autoconf >= 2.54
+BuildRequires: autoconf >= 2.58
 BuildRequires: rpm-perlprov
+BuildRequires: texinfo >= 4.7
 Requires(pre): fileutils
-Requires:      perl-base
 Requires:      perl(File::Glob)
-Conflicts:     autoconf < 2.54
-BuildArch:     noarch
+Conflicts:     autoconf < 2.58
+Conflicts:     libtool < 2:1.5-11
+#BuildArch:    noarch -- autoconf doesn't allow
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _aclocaldir     %{_datadir}/aclocal
@@ -87,7 +87,6 @@ Makefile'
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__autoconf}