[perl-Net-SSH-Perl] Fix dependency filtering for Crypt::IDEA in rpm 4.9

Paul Howarth pghmcfc at fedoraproject.org
Sat Feb 12 10:57:09 UTC 2011


commit f21f832bf6c1a89c6d55808e2fdfad5947300509
Author: Paul Howarth <paul at city-fan.org>
Date:   Sat Feb 12 10:56:56 2011 +0000

    Fix dependency filtering for Crypt::IDEA in rpm 4.9

 perl-Net-SSH-Perl.spec |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/perl-Net-SSH-Perl.spec b/perl-Net-SSH-Perl.spec
index 0581114..b315541 100644
--- a/perl-Net-SSH-Perl.spec
+++ b/perl-Net-SSH-Perl.spec
@@ -4,7 +4,7 @@
 Summary:	SSH (Secure Shell) client
 Name:		perl-Net-SSH-Perl
 Version:	1.34
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Net-SSH-Perl/
@@ -40,7 +40,13 @@ BuildRequires:	perl(Test::YAML::Meta)		>= 0.03
 BuildRequires:	perl(Perl::Critic)
 BuildRequires:	perl(Text::SpellChecker), hunspell-en
 
-%{?_with_IDEA:BuildRequires: perl(Crypt::IDEA)}
+# If building with IDEA support, we need to build with Crypt::IDEA,
+# otherwise we need to filter out the dependency on it
+%if 0%{?_with_IDEA:1}
+BuildRequires:	perl(Crypt::IDEA)
+%else
+%global __requires_exclude ^perl\\(Crypt::IDEA\\)
+%endif
 
 # Make sure the installed package has blowfish support
 Requires:	perl(Crypt::Blowfish)
@@ -68,7 +74,7 @@ cd -
 export GNUPGHOME=$(pwd)/gnupghome
 %{__gpg} --import %{SOURCE1} %{SOURCE2}
 
-# Remove Crypt::IDEA dep if we're not supporting the IDEA algorithm
+# Remove Crypt::IDEA dep if we're not supporting the IDEA algorithm and we don't have rpm 4.9
 %define bogusreq 'perl(Crypt::IDEA)'
 %global reqfilt /bin/sh -c "%{__perl_requires} | %{__grep} -Fvx %{bogusreq}"
 %{!?_with_IDEA:%define __perl_requires %{reqfilt}}
@@ -111,6 +117,9 @@ LC_ALL=en_US %{__make} -C Net-SSH-Perl-%{version} test \
 %{_mandir}/man3/Net::SSH::Perl*.3pm*
 
 %changelog
+* Sat Feb 12 2011 Paul Howarth <paul at city-fan.org> 1.34-11
+- Fix dependency filtering for Crypt::IDEA in rpm 4.9
+
 * Wed Feb  9 2011 Paul Howarth <paul at city-fan.org> 1.34-10
 - Update fix for spell check test as dictionary coverage in Rawhide appears
   to have gone down



More information about the perl-devel mailing list