From 4835eb04fb59e65dab2d7146d0afcca74322587f Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 12 Dec 2011 10:51:05 +0000
Subject: Fix perl module filtering.

---
 contrib/crossrpms/autotools/autoconf.add | 10 ++++++++--
 contrib/crossrpms/autotools/automake.add | 11 ++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'contrib/crossrpms')

diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add
index 3ca5d97864..eaca5b0f57 100644
--- a/contrib/crossrpms/autotools/autoconf.add
+++ b/contrib/crossrpms/autotools/autoconf.add
@@ -30,6 +30,10 @@ Requires(preun):	/sbin/install-info
 
 @SOURCES@
 
+# remove bogus Autoconf perl dependencies and provides
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Autom4te::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Autom4te::
+
 %description
 GNU's Autoconf is a tool for configuring source code and Makefiles.
 Using Autoconf, programmers can create portable and configurable
@@ -47,13 +51,14 @@ their use.
 %setup -q -n autoconf-%{srcvers}
 %{?PATCH0:%patch0 -p1}
 
+%if !%{defined fedora}
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* |\
     sed -e '/^perl(Autom4te/d'
 EOF
-%define __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
+%global __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-requ
@@ -61,8 +66,9 @@ cat << \EOF > %{name}-requ
 %{__perl_requires} $* |\
     sed -e '/^perl(Autom4te/d'
 EOF
-%define __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
+%global __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
 chmod +x %{__perl_requires}
+%endif
 
 %build
 ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add
index 44c4a2a8cb..7e500feda5 100644
--- a/contrib/crossrpms/autotools/automake.add
+++ b/contrib/crossrpms/autotools/automake.add
@@ -27,6 +27,10 @@ Requires(preun):/sbin/install-info
 
 @SOURCES@
 
+# remove bogus Automake perl dependencies and provides
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake::
+
 %description
 Automake is a tool for automatically generating "Makefile.in"s from
 files called "Makefile.am". "Makefile.am" is basically a series of
@@ -38,13 +42,14 @@ standards.
 %setup -q -n automake-%{srcvers}
 %{?PATCH0:%patch0 -p1}
 
+%if !%{defined fedora}
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* |\
     sed -e '/^perl(Automake/d'
 EOF
-%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
+%global __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-requ
@@ -52,9 +57,9 @@ cat << \EOF > %{name}-requ
 %{__perl_requires} $* |\
     sed -e '/^perl(Automake/d'
 EOF
-%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
+%global __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
 chmod +x %{__perl_requires}
-
+%endif
 
 %build
 PATH=%{_bindir}:$PATH
-- 
cgit v1.2.3