From e7695576b78f8f7460783a874c0c5b1797195b1c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 4 Apr 2017 15:49:14 +0200
Subject: improv. multi-version case

---
 checkpkgist.php |  9 +++++----
 multiver.json   | 16 +++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/checkpkgist.php b/checkpkgist.php
index a91e1ab..e853081 100755
--- a/checkpkgist.php
+++ b/checkpkgist.php
@@ -81,13 +81,14 @@ function getMax($name, $rpm) {
 	$crt  = 0;
 	$max  = 9999;
 
-	if (preg_match('/[0-9]+$/', $rpm, $reg)) {
-		// This already a versionned name
-		$crt = intval($reg[0]);
-	}
 	if (isset($vers[$rpm])) {
 		$crt = $vers[$rpm];
 		$max = $crt+1;
+
+	} else if (preg_match('/[0-9]+$/', $rpm, $reg)) {
+		// This already a versionned name
+		$crt = intval($reg[0]);
+		$max = $crt+1;
 	}
 	foreach($rpms as $alt) {
 		if ($alt != $rpm && preg_match('/[0-9]+$/', $alt, $reg)) {
diff --git a/multiver.json b/multiver.json
index d4a6032..dd13a17 100644
--- a/multiver.json
+++ b/multiver.json
@@ -1,16 +1,10 @@
 {
-    "php-JsonSchema": 1,
-    "php-justinrainbow-json-schema": 2,
-    "php-PHPParser": 1,
-    "php-pimple1": 1,
+	"php-JsonSchema": 1,
+	"php-justinrainbow-json-schema": 2,
+	"php-PHPParser": 1,
+	"php-pimple1": 1,
 	"php-phpunit-PHPUnit": 5,
-	"php-phpunit-PHPUnit-MockObject": 3,
-	"php-phpunit-PHP-CodeCoverage": 4,
-    "php-phpunit-DbUnit": 2,
-    "php-phpunit-phpcov": 3,
-    "php-robrichards-xmlseclibs1": 1,
-    "php-robrichards-xmlseclibs": 2,
-    "php-symfony": 2,
+	"php-symfony": 2,
 	"php-udan11-sql-parser": 3
 }
 
-- 
cgit