summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@971eb68f-4bfb-0310-8326-d2484c010a4c>2012-06-09 14:51:37 +0000
committertv <tv@971eb68f-4bfb-0310-8326-d2484c010a4c>2012-06-09 14:51:37 +0000
commit760cc3f73c4046e239040db1876da050ece1220a (patch)
tree453aac5a972d528e8f035786d01e4f092274a5b4
parent11f137ec73ef1d66fa17da6523965b2cb3df28cc (diff)
downloadperl-RPM4-760cc3f73c4046e239040db1876da050ece1220a.tar
perl-RPM4-760cc3f73c4046e239040db1876da050ece1220a.tar.gz
perl-RPM4-760cc3f73c4046e239040db1876da050ece1220a.tar.bz2
perl-RPM4-760cc3f73c4046e239040db1876da050ece1220a.tar.xz
perl-RPM4-760cc3f73c4046e239040db1876da050ece1220a.zip
fix build with rpm-4.10.0
git-svn-id: svn+ssh://haiku.zarb.org/home/projects/rpm4/svn/trunk@184 971eb68f-4bfb-0310-8326-d2484c010a4c
-rw-r--r--RPM4/Makefile.PL5
-rw-r--r--RPM4/NEWS2
2 files changed, 4 insertions, 3 deletions
diff --git a/RPM4/Makefile.PL b/RPM4/Makefile.PL
index 48f1908..0f15e6e 100644
--- a/RPM4/Makefile.PL
+++ b/RPM4/Makefile.PL
@@ -5,9 +5,8 @@ use ExtUtils::MakeMaker;
use Getopt::Long;
#- require at least rpm 4.2
-my $rpm_version = `rpm --version`;
-$rpm_version =~ s/RPM version //;
-$rpm_version =~ /^(?:[5-9]|\d{2}|4\.[2-9])/
+my $rpm_version = `rpm --version` =~ /version ([0-9.]+)$/ ? version->new("v$1") : ();
+$rpm_version ge 4.6.0
or die <<BARF;
Unable to build RPM4 with too old (or undetected) rpm version $rpm_version
BARF
diff --git a/RPM4/NEWS b/RPM4/NEWS
index 8dbcf26..a0009bc 100644
--- a/RPM4/NEWS
+++ b/RPM4/NEWS
@@ -1,3 +1,5 @@
+- fix build with rpm-4.10.0
+
Version 0.27 - 21 December 2011
- make Spec->build works with rpm-4.9