Sync a couple of Perl patches with cooker

rpm-5.4.10-fix-perl-abi-provides-version.patch

@@ -0,0 +1,22 @@
+--- rpm-5.4.10/scripts/perl.prov.perl_abiver~	2012-12-19 01:42:07.219674388 +0100
++++ rpm-5.4.10/scripts/perl.prov	2012-12-19 01:42:13.285755596 +0100
+@@ -97,11 +97,15 @@ sub process_file {
+   my ($file) = @_;
+   
+   if ($file =~ m/$Config{archname}\/Config.pm$/) {
+-      my $vercmd = "perl -I". File::Basename::dirname($file) . " -MConfig -e 'print \"\$Config{version}\"'";
+-      my $v = `$vercmd`;
+-      if ($v) {
+-        $require{"abi"} = $v;
++    my $vercmd = "perl -I". File::Basename::dirname($file) . " -MConfig -e 'print \"VERSION=\$Config{version}\"'";
++    my $v = `$vercmd 2>&1`;
++    if ($v) {
++      if ($? && $v =~ m!^Perl lib version \((\d*.\d*.\d*)\) doesn't match executable!) {
++	$require{"abi"} = $1;
++      } elsif($v =~ m!^VERSION=(\d*.\d*.\d*)!) {
++	$require{"abi"} = $1;
+       }
++    }
+   }
+ 
+   if (!open(FILE, $file)) {

rpm-5.4.10-no-more-explicit-perl-abi-version-reqs.patch

@@ -0,0 +1,39 @@
+--- rpm-5.4.10/scripts/perl.req.perl_abireq~	2012-12-19 04:47:18.928428133 +0100
++++ rpm-5.4.10/scripts/perl.req	2012-12-19 04:45:40.698118700 +0100
+@@ -59,15 +59,18 @@ if ("@ARGV") {
+ 
+ foreach $module (sort keys %require) {
+   if ($module =~ m/^abi$/) {
+-      print "perl($module) = $require{$module}\n";
+-      next;
++#   in ROSA Linux the perl library now has a versioned soname, so no need
++#   for explicit version dependency for modules anymore
++#   print "perl($module) = $require{$module}\n";
++    print "perl($module) >= $require{$module}\n";
++    next;
+   } elsif ($module =~ m/^api$/) {
+-      print "perl(abi) >= $require{$module}\n";
+-      next;
++    print "perl(abi) >= $require{$module}\n";
++    next;
+   }
+   # XXX: skip any modules not starting with upper case letters
+   if ($module =~ m/^[^A-Z]/) {
+-      next;
++    next;
+   }
+   if (length($require{$module}) == 0) {
+     print "perl($module)\n";
+@@ -78,9 +81,9 @@ foreach $module (sort keys %require) {
+     # $RPM_* variable when I upgrade.
+ 
+     my $v = qx{ rpm --eval '%perl_convert_version $require{$module}' }; #' workaround vim highlighting issue.. ;)
+-    chomp($v);
+-    print "perl($module) >= $v\n";
+-  }
++  chomp($v);
++  print "perl($module) >= $v\n";
++}
+ }
+ 
+ exit 0;

rpm.spec

@@ -59,7 +59,7 @@ Summary:	The RPM package management system
 Name:		rpm
 Epoch:		1
 Version:	%{libver}.%{minorver}
-Release:	%{?prereldate:0.%{prereldate}.}29
+Release:	%{?prereldate:0.%{prereldate}.}30
 License:	LGPLv2.1+
 Group:		System/Configuration/Packaging
 URL:		http://rpm5.org/
@@ -362,7 +362,15 @@ Patch165:       rpm-5.4.10-post-install-helper-order.patch
 # fixes issue with ldflags getting duplicated when configure is run more than once
 # status: ready
 Patch166:       rpm-5.4.10-fix-ldflags-passing.patch
-
+# fixes extraction of perl version from Config.pm when it's of a different
+# version than system version
+# status: ready
+Patch167:       rpm-5.4.10-fix-perl-abi-provides-version.patch
+# in our perl package, the perl library now has a versioned soname, so there's no
+# longer any need for special treatment of perl extension with explicitly
+# versioned perl(abi) dependencies anymore
+# status: relies on mandriva specific behaviour with local patches, so keep locally
+Patch168:       rpm-5.4.10-no-more-explicit-perl-abi-version-reqs.patch
 # this patch updates the upstream brp-compress scripts, which will be replacing
 # our own locally maintained compress-files script from spec-helper
 # status: ready
@@ -851,7 +859,8 @@ This package contains the RPM API documentation generated in HTML format.
 
 %patch165 -p1 -b .helper_order~
 %patch166 -p1 -b .ldflags~
-
+%patch167 -p1 -b .perl_abiver~
+%patch168 -p1 -b .perl_abireq~
 %patch169 -p1 -b .brpcomp~
 %patch170 -p1 -b .dbconvert52~
 %patch171 -p1 -b .python3~