Update to 2.6.0

add dependency on composer/semver

2 files changed, 20 insertions, 4 deletions

diff --git a/composer.json b/composer.json
index babbe95..e3d1045 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
         "php": "^5.6 || >=7.0 <7.2",
         "ext-json": "*",
         "ext-tokenizer": "*",
+        "composer/semver": "^1.4",
         "doctrine/annotations": "^1.2",
         "gecko-packages/gecko-php-unit": "^2.0",
         "sebastian/diff": "^1.4",
@@ -62,5 +63,10 @@
     "autoload-dev": {
         "psr-4": { "PhpCsFixer\\Tests\\": "tests/" }
     },
-    "bin": ["php-cs-fixer"]
+    "bin": ["php-cs-fixer"],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.6-dev"
+        }
+    }
 }
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index a79adb8..5dcbf35 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    63aad575ec2a29d50eb6c3b5cbc17430b28895b2
+%global gh_commit    5642a36a60c11cdd01488d192541a89bb44a4abf
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     FriendsOfPHP
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-cs-fixer
-Version:        2.5.0
+Version:        2.6.0
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A tool to automatically fix PHP code style
 
@@ -32,8 +32,10 @@ Patch0:         %{name}-autoload.patch
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
-BuildRequires:  php(language) >= 5.4
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-tokenizer
+BuildRequires:  php-composer(composer/semver)          <  2
+BuildRequires:  php-composer(composer/semver)          >= 1.4
 BuildRequires:  php-composer(doctrine/annotations)     <  2
 BuildRequires:  php-composer(doctrine/annotations)     >= 1.2
 BuildRequires:  php-composer(gecko-packages/gecko-php-unit) <  3
@@ -93,6 +95,7 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "php": "^5.6 || >=7.0 <7.2",
 #        "ext-json": "*",
 #        "ext-tokenizer": "*",
+#        "composer/semver": "^1.4",
 #        "doctrine/annotations": "^1.2",
 #        "gecko-packages/gecko-php-unit": "^2.0",
 #        "sebastian/diff": "^1.4",
@@ -109,6 +112,8 @@ BuildRequires:  php-fedora-autoloader-devel
 Requires:       php(language) >= 5.6
 Requires:       php-json
 Requires:       php-tokenizer
+Requires:       php-composer(composer/semver)          <  2
+Requires:       php-composer(composer/semver)          >= 1.4
 Requires:       php-composer(doctrine/annotations)     <  2
 Requires:       php-composer(doctrine/annotations)     >= 1.2
 Requires:       php-composer(gecko-packages/gecko-php-unit) <  3
@@ -192,6 +197,7 @@ cat << 'EOF' | tee -a src/autoload.php
 
 \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__);
 \Fedora\Autoloader\Dependencies::required([
+    '%{php_home}//Composer/Semver/autoload.php',
     '%{php_home}/GeckoPackages/PHPUnit/autoload.php',
     '%{php_home}/Doctrine/Common/Annotations/autoload.php',
     '%{php_home}/Symfony3/Component/Console/autoload.php',
@@ -267,6 +273,10 @@ exit $ret
 
 
 %changelog
+* Tue Sep 12 2017 Remi Collet <remi@remirepo.net> - 2.6.0-1
+- Update to 2.6.0
+- add dependency on composer/semver
+
 * Wed Aug 23 2017 Remi Collet <remi@remirepo.net> - 2.5.0-1
 - Update to 2.5.0
 - add dependency on php-cs-fixer/accessible-object