OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Apr-2008 12:43:32
Branch: HEAD Handle: 2008040911433200
Modified files:
openpkg-src/perl-openpkg
perl-openpkg.pl perl-openpkg.spec
Log:
support output of RPM 5.1
Summary:
Revision Changes Path
1.22 +1 -1 openpkg-src/perl-openpkg/perl-openpkg.pl
1.37 +1 -1 openpkg-src/perl-openpkg/perl-openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-openpkg/perl-openpkg.pl
============================================================================
$ cvs diff -u -r1.21 -r1.22 perl-openpkg.pl
--- openpkg-src/perl-openpkg/perl-openpkg.pl 7 Jan 2008 21:06:06 -0000
1.21
+++ openpkg-src/perl-openpkg/perl-openpkg.pl 9 Apr 2008 10:43:32 -0000
1.22
@@ -206,7 +206,7 @@
$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)");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-openpkg/perl-openpkg.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 perl-openpkg.spec
--- openpkg-src/perl-openpkg/perl-openpkg.spec 9 Jan 2008 09:24:05
-0000 1.36
+++ openpkg-src/perl-openpkg/perl-openpkg.spec 9 Apr 2008 10:43:32
-0000 1.37
@@ -35,7 +35,7 @@
Group: Perl
License: PD
Version: %{V_perl}
-Release: 20080109
+Release: 20080409
# list of sources
Source0: perl-openpkg.pl
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]