commit 8a29fde4880f07824a4934accc95afcad00f8914
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jan 6 23:23:10 2016 +0200
versionparser.patch moved to semver
satis.spec | 1 +
versionparser.patch | 16 ----------------
2 files changed, 1 insertion(+), 16 deletions(-)
---
diff --git a/satis.spec b/satis.spec
index 663afff..7554548 100644
--- 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
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]
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/satis.git/commitdiff/8a29fde4880f07824a4934accc95afcad00f8914
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
