From fce55e6bfad2f559c2106dfa2d80cbe1e2238288 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 4 May 2020 08:09:10 +0200
Subject: update to 2.7.2 allow composer/semver version 2

---
 composer.json |  2 +-
 phan.spec     | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 112fffd..bbe2aa5 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "ext-filter": "*",
         "ext-json": "*",
         "ext-tokenizer": "*",
-        "composer/semver": "^1.4",
+        "composer/semver": "^1.4|^2.0",
         "composer/xdebug-handler": "^1.3.2",
         "felixfbecker/advanced-json-rpc": "^3.0.4",
         "microsoft/tolerant-php-parser": "0.0.20",
diff --git a/phan.spec b/phan.spec
index f4f0237..8504d00 100644
--- a/phan.spec
+++ b/phan.spec
@@ -10,14 +10,14 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    67c51bb1593e5c30271fc16d691b82e318b90b77
+%global gh_commit    df79f6def6cb7643955af14aa4b97acdd3495ad6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phan
 #global gh_date      20150820
 %global gh_project   phan
 %global psr0         Phan
 %global with_tests   0%{!?_without_tests:1}
-%global upstream_version 2.7.1
+%global upstream_version 2.7.2
 #global upstream_prever  RC2
 
 Name:           %{gh_project}
@@ -39,7 +39,7 @@ BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-ast >= 1.0.6
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)
+BuildRequires:  (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 3)
 BuildRequires:  (php-composer(composer/xdebug-handler) >= 1.3.2        with php-composer(composer/xdebug-handler) < 2)
 BuildRequires:  (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) <  4)
 BuildRequires:  (php-composer(microsoft/tolerant-php-parser) >= 0.0.20 with php-composer(microsoft/tolerant-php-parser) <  0.1)
@@ -48,7 +48,7 @@ BuildRequires:  (php-composer(sabre/event) >= 5.0                      with php-
 BuildRequires:  (php-composer(symfony/console) >= 2.8                  with php-composer(symfony/console) <  6)
 # remirepo:15
 %else
-BuildRequires:  php-composer(composer/semver) < 2
+BuildRequires:  php-composer(composer/semver) < 3
 BuildRequires:  php-composer(composer/semver) >= 1.4
 BuildRequires:  php-composer(composer/xdebug-handler) < 2
 BuildRequires:  php-composer(composer/xdebug-handler) >= 1.3.2
@@ -90,7 +90,7 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "ext-filter": "*",
 #        "ext-json": "*",
 #        "ext-tokenizer": "*",
-#        "composer/semver": "^1.4",
+#        "composer/semver": "^1.4|^2.0",
 #        "composer/xdebug-handler": "^1.3.2",
 #        "felixfbecker/advanced-json-rpc": "^3.0.4",
 #        "microsoft/tolerant-php-parser": "0.0.20",
@@ -114,7 +114,7 @@ Requires:       php-json
 Recommends:     php-ast >= 1.0.6
 Suggests:       php-igbinary
 Suggests:       php-iconv
-Requires:       (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 2)
+Requires:       (php-composer(composer/semver) >= 1.4                  with php-composer(composer/semver) < 3)
 Requires:       (php-composer(composer/xdebug-handler) >= 1.3.2        with php-composer(composer/xdebug-handler) < 2)
 Requires:       (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) <  4)
 Requires:       (php-composer(nikic/php-parser) >= 3.1.1               with php-composer(nikic/php-parser) <  4)
@@ -125,7 +125,7 @@ Requires:       (php-composer(symfony/console) >= 2.8                  with php-
 # remirepo:16
 %else
 Requires:       php-ast >= 0.1.5
-Requires:       php-composer(composer/semver) < 2
+Requires:       php-composer(composer/semver) < 3
 Requires:       php-composer(composer/semver) >= 1.4
 Requires:       php-composer(composer/xdebug-handler) < 2
 Requires:       php-composer(composer/xdebug-handler) >= 1.3.2
@@ -179,7 +179,10 @@ cat << 'EOF' | tee src/autoload.php
 require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Phan\\', __DIR__ . '/Phan');
 \Fedora\Autoloader\Dependencies::required([
-    '%{_datadir}/php/Composer/Semver/autoload.php',
+    [
+        '%{_datadir}/php/Composer/Semver2/autoload.php',
+        '%{_datadir}/php/Composer/Semver/autoload.php',
+    ],
     '%{_datadir}/php/Composer/XdebugHandler/autoload.php',
     '%{_datadir}/php/AdvancedJsonRpc3/autoload.php',
     '%{_datadir}/php/Microsoft/PhpParser/autoload.php',
@@ -244,6 +247,10 @@ EOF
 
 
 %changelog
+* Mon May  4 2020 Remi Collet <remi@remirepo.net> - 2.7.2-1
+- update to 2.7.2
+- allow composer/semver version 2
+
 * Mon Apr 13 2020 Remi Collet <remi@remirepo.net> - 2.7.1-1
 - update to 2.7.1
 
-- 
cgit