[packages/php-composer-semver] rediff versionparser.patch

glen glen at pld-linux.org
Fri Sep 2 17:07:16 CEST 2016


commit 94e8700731a68336f41f847bdacb970bf559efbb
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Sep 2 18:07:04 2016 +0300

    rediff versionparser.patch

 php-composer-semver.spec |  2 +-
 versionparser.patch      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/php-composer-semver.spec b/php-composer-semver.spec
index 8791dc9..1d8561f 100644
--- a/php-composer-semver.spec
+++ b/php-composer-semver.spec
@@ -24,7 +24,7 @@ made available as a stand-alone library.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p7 -d src
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/versionparser.patch b/versionparser.patch
index 4eab141..76decf3 100644
--- a/versionparser.patch
+++ b/versionparser.patch
@@ -1,16 +1,16 @@
 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);
+--- semver-1.4.2/src/VersionParser.php	2016-08-30 19:08:34.000000000 +0300
++++ semver-1.4.2/src/VersionParser.php	2016-09-02 18:03:41.267807721 +0300
+@@ -125,6 +125,11 @@
+             $version = $match[1];
          }
  
-+		// XXX: convert 1.2-3 to 1.2-p3
-+		if (preg_match('/^(\d+[\d.]+)-(\d+)$/', $version, $m)) {
-+			$version = "{$m[1]}-p{$m[2]}";
-+		}
++        // 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)) {
+         if (preg_match('{^v?(\d{1,5})(\.\d++)?(\.\d++)?(\.\d++)?' . self::$modifierRegex . '$}i', $version, $matches)) {
              $version = $matches[1]
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-composer-semver.git/commitdiff/94e8700731a68336f41f847bdacb970bf559efbb



More information about the pld-cvs-commit mailing list