diff -ru cpan2rpm-2.022-orig/cpan2rpm cpan2rpm-2.022/cpan2rpm --- cpan2rpm-2.022-orig/cpan2rpm 2004-01-30 18:46:04.000000000 -0600 +++ cpan2rpm-2.022/cpan2rpm 2004-01-30 18:55:02.000000000 -0600 @@ -617,15 +617,10 @@ unless $info{source}; $info{changelog} = changelog(); - my $find_requires - = getrpm_ver() >= 420 - ? "__perl_requires" - : "__find_requires" - ; $info{"find-provides"} &&= qq/%define __find_provides $info{"find-provides"}/; $info{"find-requires"} - &&= qq/%define $find_requires $info{"find-requires"}/; + &&= qq/%define __find_requires $info{"find-requires"}\n%define __perl_requires $info{"find-requires"}/; # option lists @@ -683,7 +678,8 @@ $info{"no-requires"}{"define"} = "%define custom_find_req %{_tmppath}/%{NVR}-find-requires"; $info{"find-requires"} = "%define _use_internal_dependency_generator 0"; - $info{"find-requires"} = "\n%define $find_requires %{custom_find_req}"; + $info{"find-requires"} .= "\n%define __find_requires %{custom_find_req}"; + $info{"find-requires"} .= "\n%define __perl_requires %{custom_find_req}"; local $_ = qq[cat < %{custom_find_req} #!/bin/sh /usr/lib/rpm/find-requires |grep -v $noreqs