Parcourir la source

support output of RPM 5.1

Ralf S. Engelschall il y a 17 ans
Parent
commit
aa61659fe1
2 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 1 1
      perl-openpkg/perl-openpkg.pl
  2. 1 1
      perl-openpkg/perl-openpkg.spec

+ 1 - 1
perl-openpkg/perl-openpkg.pl

@@ -206,7 +206,7 @@ if (not -x $CF->{prog_rpm}) {
     $CF->{prog_rpm} = &fullpath($CF->{prog_rpm});
 }
 my $V = `$CF->{prog_rpm} --version 2>/dev/null`;
-$V =~ s/^(?:RPM version|OpenPKG RPM|rpm\s+\(.+?\))\s+([0-9.]+)(\.(?:SNAPSHOT|DEVEL).*)?\s*$/$1/s ||
+$V =~ s/^(?:rpm \(OpenPKG RPM\)|RPM version|OpenPKG RPM|rpm\s+\(.+?\))\s+([0-9ab.]+)(\.(?:SNAPSHOT|DEVEL).*)?\s*$/$1/s ||
     die "program '$CF->{prog_rpm}' seems to be not RPM";
 &verbose("determined RPM  program: $CF->{prog_rpm} ($V)");
 

+ 1 - 1
perl-openpkg/perl-openpkg.spec

@@ -35,7 +35,7 @@ Class:        BASE
 Group:        Perl
 License:      PD
 Version:      %{V_perl}
-Release:      20080109
+Release:      20080409
 
 #   list of sources
 Source0:      perl-openpkg.pl