From 0debd1e2321314f07b4df99a1785c06f9925eecb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 26 Apr 2022 11:43:29 +0200 Subject: Fix detecting 4.18-alpha1 --- RPM4/NEWS | 1 + RPM4/src/Makefile.PL | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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: -- cgit v1.2.1