summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2022-04-26 11:43:29 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2022-04-27 00:03:33 +0200
commit0debd1e2321314f07b4df99a1785c06f9925eecb (patch)
treebb022aaf0b92e400b8f39b86231590e26c955de0
parent459cfa86669da8ed654cd05e36b9556aa15ee4fc (diff)
downloadperl-RPM4-0debd1e2321314f07b4df99a1785c06f9925eecb.tar
perl-RPM4-0debd1e2321314f07b4df99a1785c06f9925eecb.tar.gz
perl-RPM4-0debd1e2321314f07b4df99a1785c06f9925eecb.tar.bz2
perl-RPM4-0debd1e2321314f07b4df99a1785c06f9925eecb.tar.xz
perl-RPM4-0debd1e2321314f07b4df99a1785c06f9925eecb.zip
Fix detecting 4.18-alpha1
-rw-r--r--RPM4/NEWS1
-rw-r--r--RPM4/src/Makefile.PL2
2 files changed, 2 insertions, 1 deletions
diff --git a/RPM4/NEWS b/RPM4/NEWS
index b1b11dc..f97923b 100644
--- a/RPM4/NEWS
+++ b/RPM4/NEWS
@@ -1,3 +1,4 @@
+- Fix detecting 4.18-alpha1
- Testsuite:
o Fix failure with rpm-4.17.0+
o Re-enable some tests disabled long ago
diff --git a/RPM4/src/Makefile.PL b/RPM4/src/Makefile.PL
index f5f0440..527fb47 100644
--- a/RPM4/src/Makefile.PL
+++ b/RPM4/src/Makefile.PL
@@ -29,7 +29,7 @@ $rpmheaderlocation or die "Can't find rpmheader location";
# Just to get rpm version. Deps checking has been done by ../Makefile.PL:
my %cfg = ExtUtils::PkgConfig->find("rpm");
-$cfg{modversion} =~ s/(?:-(?:beta|rc).*)?$//i;
+$cfg{modversion} =~ s/(?:-(?:alpha|beta|rc).*)?$//i;
$rpmv ||= $cfg{modversion};
# Generate version-features flags depending on installed rpm version: