aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Quelin <jquelin@mageia.org>2011-03-02 17:50:42 (GMT)
committerJerome Quelin <jquelin@mageia.org>2011-03-02 17:50:42 (GMT)
commitfd524c2a0adc3204f43e8db1cda805f7c92abd52 (patch)
treeb8c5c5a332e90e843338b78461213205cd227a93
parent0f1dd7bebbea6916dc5d698099a8a4cbfb829e81 (diff)
make v1.118 work with perl modules having a number followed by a _ in1.119
their name, and a fully qualified VERSION (eg $l1_cache::VERSION = ...)
-rw-r--r--NEWS4
-rw-r--r--configure.ac2
-rwxr-xr-xperl.prov2
3 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2b3ad13..084a837 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 1.119 - 2 March 2011, by Jerome Quelin
+- make v1.118 work with perl modules having a number followed by a _ in
+ their name, and a fully qualified VERSION (eg $l1_cache::VERSION = ...)
+
Version 1.118 - 26 February 2011, by Jerome Quelin
- support for _ in perl module version
diff --git a/configure.ac b/configure.ac
index 82b8589..e3c34b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.118, jquelin@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.119, jquelin@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability)
AC_CONFIG_SRCDIR
diff --git a/perl.prov b/perl.prov
index 85b8e81..3b4c795 100755
--- a/perl.prov
+++ b/perl.prov
@@ -159,7 +159,7 @@ sub process_file {
if (m/(\$Revision: (\d+[.0-9]+))/) {
$version= $2;
- } elsif (m/[\'\"]?(\d+[._0-9]+)[\'\"]?/) {
+ } elsif (m/VERSION.*?[\'\"]?(\d+[._0-9]+)[\'\"]?/) {
# look for a static number hard coded in the script