SPECS: automake.spec - allow build with autoconf > 2.60 - fix buil...

[tommat]

Author: tommat                       Date: Thu Feb  8 11:53:53 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- allow build with autoconf > 2.60
- fix build on sparc multilib
- rel 2

---- Files affected:
SPECS:
   automake.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/automake.spec
diff -u SPECS/automake.spec:1.123 SPECS/automake.spec:1.124
--- SPECS/automake.spec:1.123	Sat Oct 28 15:12:35 2006
+++ SPECS/automake.spec	Thu Feb  8 12:53:48 2007
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	regeneration	# without full regeneration
+#
 %include	/usr/lib/rpm/macros.perl
 Summary:	GNU automake - Makefile configuration tools
 Summary(de):	GNU automake - Makefile-Konfigurationstools
@@ -12,7 +16,7 @@
 Summary(uk):	GNU automake - ŚÎÓÔŇŐÍĹÎÔÉ ÄĚŃ Á×ÔĎÍÁÔÉŢÎϧ ÇĹÎĹŇÁĂŚ§ Makefile'Ś×
 Name:		automake
 Version:	1.10
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		Development/Building
@@ -23,7 +27,12 @@
 Patch2:		%{name}-no_versioned_dir.patch
 Patch3:		%{name}-morearchs.patch
 URL:		http://sources.redhat.com/automake/
+%if %{with regeneration}
 BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake
+%else
+BuildRequires:	autoconf = 2.60
+%endif
 BuildRequires:	rpm-perlprov
 BuildRequires:	texinfo >= 4.7
 Requires(pre):	fileutils
@@ -91,7 +100,13 @@
 %patch3 -p1
 
 %build
+%if %{with regeneration}
+%{__aclocal} -I m4
+%endif
 %{__autoconf}
+%if %{with regeneration}
+%{__automake}
+%endif
 %configure
 %{__make}
 
@@ -153,6 +168,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2007/02/08 11:53:48  tommat
+- allow build with autoconf > 2.60
+- fix build on sparc multilib
+- rel 2
+
 Revision 1.123  2006/10/28 13:12:35  glen
 - cleanup unused macro
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/automake.spec?r1=1.123&r2=1.124&f=u