[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Wed Mar 20 07:40:58 UTC 2013


Module:    rtems-crossrpms
Branch:    rtems-4-10-branch
Commit:    9fde2ba54d0a0a6e2c9152d1b9ff2b35ccff7b70
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=9fde2ba54d0a0a6e2c9152d1b9ff2b35ccff7b70

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Tue Mar 19 18:33:27 2013 +0100

Regenerate.

---

 autotools/Makefile.in              |    4 ++--
 autotools/rtems-4.10-autoconf.spec |   12 +++---------
 autotools/rtems-4.10-automake.spec |    6 +++---
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/autotools/Makefile.in b/autotools/Makefile.in
index e781c51..6b317c5 100644
--- a/autotools/Makefile.in
+++ b/autotools/Makefile.in
@@ -176,14 +176,14 @@ MKSPEC0 = sed \
 	  -e "s/[@]rtems_api[@]/$(rtems_api)/g"
 
 AUTOCONF_VERS = 2.68
-AUTOCONF_RPMREL = 3
+AUTOCONF_RPMREL = 4
 AUTOCONF_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/autotools/autoconf.add \
 	$(top_srcdir)/binutils/rpm-install.add \
 	$(top_srcdir)/common/clean.add \
 	$(top_srcdir)/autotools/target-autoconf.add
 AUTOMAKE_VERS = 1.11.1
-AUTOMAKE_RPMREL = 3
+AUTOMAKE_RPMREL = 4
 AUTOMAKE_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/autotools/automake.add \
 	$(top_srcdir)/binutils/rpm-install.add \
diff --git a/autotools/rtems-4.10-autoconf.spec b/autotools/rtems-4.10-autoconf.spec
index 1a35a9d..12ba568 100644
--- a/autotools/rtems-4.10-autoconf.spec
+++ b/autotools/rtems-4.10-autoconf.spec
@@ -61,7 +61,7 @@ License:	GPL
 URL:		http://www.gnu.org/software/autoconf
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,19 +69,13 @@ BuildArch:	noarch
 BuildRequires: 	perl m4 gawk emacs
 BuildRequires:  /bin/hostname
 BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(Text::ParseWords)
 BuildRequires:  m4 >= 1.4.5
 Requires:     	m4 gawk
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
 Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
-%if "%{srcvers}" == "2.66"
-# Fedora's patch to fix
-# http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html
-# http://lists.gnu.org/archive/html/bug-autoconf/2010-07/msg00012.html
-Patch0: autoconf-2.66-611661.diff
-%endif
-
 
 
 # rpm-4.9 filter
@@ -112,7 +106,7 @@ their use.
 %setup -q -n autoconf-%{srcvers}
 %{?PATCH0:%patch0 -p1}
 
-%if 0%{?el5} || 0%{?suse11_4}
+%if 0%{?el5}
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
 #!/bin/sh
diff --git a/autotools/rtems-4.10-automake.spec b/autotools/rtems-4.10-automake.spec
index 829af77..c34376c 100644
--- a/autotools/rtems-4.10-automake.spec
+++ b/autotools/rtems-4.10-automake.spec
@@ -60,7 +60,7 @@ URL:		http://sources.redhat.com/automake
 License:	GPL
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,7 +95,7 @@ standards.
 %setup -q -n automake-%{srcvers}
 %{?PATCH0:%patch0 -p1}
 
-%if 0%{?el5} || 0%{?suse11_4}
+%if 0%{?el5}
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
 #!/bin/sh
@@ -195,7 +195,7 @@ fi
 %{_bindir}/automake*
 %dir %{_infodir}
 %ghost %{_infodir}/dir
-%{_infodir}/automake.info*.gz
+%{_infodir}/automake*.info*.gz
 %dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/*




More information about the vc mailing list