versionparser.patch moved to semver

diff --git a/satis.spec b/satis.spec
index 663afffe0670dec30e63dfd69006dbea0098d259..75545487e19974225641a0e4e2a31a63abb9346b 100644 (file)
--- a/satis.spec
+++ b/satis.spec
@@ -29,6 +29,7 @@ Requires:     php(core) >= %{php_min_version}
 Requires:      php(hash)
 Requires:      php(json)
 Requires:      php(pcre)
+Requires:      php-composer-semver >= 1.2.0-2
 Requires:      php-twig-Twig >= 1.7
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

diff --git a/versionparser.patch b/versionparser.patch
deleted file mode 100644 (file)
index 4eab141..0000000
--- a/versionparser.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-parse rpm-like tags: 1.2-3
-
---- vendor/composer/composer/src/Composer/Package/Version/VersionParser.php~   2015-04-28 09:19:17.000000000 +0300
-+++ vendor/composer/composer/src/Composer/Package/Version/VersionParser.php    2015-04-28 09:19:19.020725756 +0300
-@@ -117,6 +117,11 @@
-             return 'dev-'.substr($version, 4);
-         }
- 
-+              // XXX: convert 1.2-3 to 1.2-p3
-+              if (preg_match('/^(\d+[\d.]+)-(\d+)$/', $version, $m)) {
-+                      $version = "{$m[1]}-p{$m[2]}";
-+              }
-+
-         // match classical versioning
-         if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) {
-             $version = $matches[1]