summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@971eb68f-4bfb-0310-8326-d2484c010a4c>2012-12-18 00:14:22 +0000
committertv <tv@971eb68f-4bfb-0310-8326-d2484c010a4c>2012-12-18 00:14:22 +0000
commitd939d0fcd43955f367768b4a0f378e360d6bd3ce (patch)
tree5f4683cb74bd9446555a7735bd1ff801b611afcb
parenta9051e81511689db6d6e5ec646b0fa3295e1ed37 (diff)
downloadperl-RPM4-d939d0fcd43955f367768b4a0f378e360d6bd3ce.tar
perl-RPM4-d939d0fcd43955f367768b4a0f378e360d6bd3ce.tar.gz
perl-RPM4-d939d0fcd43955f367768b4a0f378e360d6bd3ce.tar.bz2
perl-RPM4-d939d0fcd43955f367768b4a0f378e360d6bd3ce.tar.xz
perl-RPM4-d939d0fcd43955f367768b4a0f378e360d6bd3ce.zip
fix retrieving rpm version with beta versions
git-svn-id: svn+ssh://haiku.zarb.org/home/projects/rpm4/svn/trunk@232 971eb68f-4bfb-0310-8326-d2484c010a4c
-rw-r--r--RPM4/Makefile.PL2
-rw-r--r--RPM4/NEWS1
2 files changed, 2 insertions, 1 deletions
diff --git a/RPM4/Makefile.PL b/RPM4/Makefile.PL
index 0aad8cb..6cf0805 100644
--- a/RPM4/Makefile.PL
+++ b/RPM4/Makefile.PL
@@ -5,7 +5,7 @@ use ExtUtils::MakeMaker;
use Getopt::Long;
#- require at least rpm 4.2
-my $rpm_version = `rpm --version` =~ /version ([0-9.]+)$/ ? version->new("v$1") : ();
+my $rpm_version = `rpm --version` =~ /version ([0-9.]+)(?:-beta.*)$/ ? version->new("v$1") : ();
$rpm_version ge 4.8.0
or die <<BARF;
Unable to build RPM4 with too old (or undetected) rpm version $rpm_version
diff --git a/RPM4/NEWS b/RPM4/NEWS
index b0aa2b2..857de40 100644
--- a/RPM4/NEWS
+++ b/RPM4/NEWS
@@ -1,4 +1,5 @@
- drop support for repackage (not working anymore since rpm-4.6)
+- fix retrieving rpm version with beta versions
- fix srcrpm()
- fix --rpmversion (broken for 6+ years...)