[rtems-crossrpms commit] Backport from master.
Ralf Corsepius
ralf at rtems.org
Wed Mar 20 07:40:58 UTC 2013
Module: rtems-crossrpms
Branch: rtems-4-10-branch
Commit: 6bdf206027c676439eec3121fd88728ad3034911
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=6bdf206027c676439eec3121fd88728ad3034911
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Tue Mar 19 18:32:25 2013 +0100
Backport from master.
---
autotools/autoconf.add | 3 ++-
autotools/automake.add | 2 +-
autotools/target-automake.add | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/autotools/autoconf.add b/autotools/autoconf.add
index d284c62..0a62909 100644
--- a/autotools/autoconf.add
+++ b/autotools/autoconf.add
@@ -26,6 +26,7 @@ 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
@@ -61,7 +62,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/automake.add b/autotools/automake.add
index 7c496aa..92b80b3 100644
--- a/autotools/automake.add
+++ b/autotools/automake.add
@@ -52,7 +52,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
diff --git a/autotools/target-automake.add b/autotools/target-automake.add
index 4658da4..40fd498 100644
--- a/autotools/target-automake.add
+++ b/autotools/target-automake.add
@@ -14,7 +14,7 @@ fi
%{_bindir}/automake*
%sysdir %{_infodir}
%ghost %{_infodir}/dir
-%{_infodir}/automake.info*.gz
+%{_infodir}/automake*.info*.gz
%sysdir %{_mandir}
%sysdir %{_mandir}/man1
%{_mandir}/man1/*
More information about the vc
mailing list