[rtems-crossrpms commit] automake-1.13.2

Ralf Corsepius ralf at rtems.org
Mon May 27 15:07:08 UTC 2013


Module:    rtems-crossrpms
Branch:    master
Commit:    dd95242e6084913930e68ab9e9da69601ed985c3
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=dd95242e6084913930e68ab9e9da69601ed985c3

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon May 27 11:57:04 2013 +0200

automake-1.13.2

---

 autotools/Makefile.am  |    2 +-
 autotools/automake.add |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/autotools/Makefile.am b/autotools/Makefile.am
index 609af59..daec320 100644
--- a/autotools/Makefile.am
+++ b/autotools/Makefile.am
@@ -4,6 +4,6 @@ AUTOCONF_VERS = 2.69
 AUTOCONF_RPMREL = 6
 include ./autoconf.am
 
-AUTOMAKE_VERS = 1.12.6
+AUTOMAKE_VERS = 1.13.2
 AUTOMAKE_RPMREL = 1
 include ./automake.am
diff --git a/autotools/automake.add b/autotools/automake.add
index 9bc736b..a430e22 100644
--- a/autotools/automake.add
+++ b/autotools/automake.add
@@ -1,27 +1,27 @@
 %global rpmvers @AUTOMAKE_VERS@
 %global srcvers	@AUTOMAKE_VERS@
-%global amvers  1.12
+%global amvers  1.13
 
 %if "%{_prefix}" != "/usr"
 %define name			@rpmprefix at automake
-%define requirements		@rpmprefix at autoconf >= 2.61
+%define requirements		@rpmprefix at autoconf >= 2.65
 %else
 %define name			automake
-%define requirements		autoconf >= 2.61
+%define requirements		autoconf >= 2.65
 %endif
 
 # --with check          enable checks (default: off)
 %bcond_with             check
 
 Name:		%{name}
-URL:		http://sources.redhat.com/automake
+URL:		http://www.gnu.org/software/automake
 License:	GPL
 Group:		Development/Tools
 Version:	%{rpmvers}
 Release:	@AUTOMAKE_RPMREL@
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
 BuildArch:	noarch
 BuildRequires:  %{requirements} perl
 Requires:     	%{requirements}
@@ -96,7 +96,7 @@ make check
 %endif
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
+%{?el5:rm -rf "$RPM_BUILD_ROOT"}
 make DESTDIR=${RPM_BUILD_ROOT} install
 
 %if "%{_prefix}" != "/usr"




More information about the vc mailing list