v2.1.0

2 files changed, 39 insertions, 20 deletions

diff --git a/composer.json b/composer.json
index 3fb6d3f..f33bdce 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "sebastian/comparator",
     "description": "Provides the functionality to compare PHP values for equality",
     "keywords": ["comparator","compare","equality"],
-    "homepage": "http://www.github.com/sebastianbergmann/comparator",
+    "homepage": "https://github.com/sebastianbergmann/comparator",
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -22,13 +22,18 @@
             "email": "bschussek@2bepublished.at"
         }
     ],
+    "prefer-stable": true,
     "require": {
         "php": "^7.0",
-        "sebastian/diff": "^1.2",
-        "sebastian/exporter": "^3.0"
+        "sebastian/diff": "^2.0",
+        "sebastian/exporter": "^3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0"
+        "phpunit/phpunit": "^6.4"
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
     },
     "autoload": {
         "classmap": [
@@ -42,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "2.1.x-dev"
         }
     }
 }
diff --git a/php-sebastian-comparator2.spec b/php-sebastian-comparator2.spec
index 2b9a657..d81c879 100644
--- a/php-sebastian-comparator2.spec
+++ b/php-sebastian-comparator2.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    20f84f468cb67efee293246e6a09619b891f55f0
+%global gh_commit    1174d9018191e93cb9d719edec01257fc05f8158
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   comparator
@@ -24,7 +24,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Compare PHP values for equality
 
@@ -35,25 +35,27 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.0
-BuildRequires:  php-composer(%{pk_vendor}/diff) >= 1.2
-BuildRequires:  php-composer(%{pk_vendor}/exporter) >= 3.0
+BuildRequires:  php-composer(%{pk_vendor}/diff) <  3
+BuildRequires:  php-composer(%{pk_vendor}/diff) >= 2.0
+BuildRequires:  php-composer(%{pk_vendor}/exporter) <  4
+BuildRequires:  php-composer(%{pk_vendor}/exporter) >= 3.1
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.0"
-BuildRequires:  phpunit6
+#        "phpunit/phpunit": "^6.4"
+BuildRequires:  phpunit6 >= 6.4
 %endif
 
 # from composer.json
 #        "php": "^7.0",
-#        "sebastian/diff": "^1.2",
-#        "sebastian/exporter": "^3.0"
+#        "sebastian/diff": "^2.0",
+#        "sebastian/exporter": "^3.1"
 Requires:       php(language) >= 7.0
-Requires:       php-composer(%{pk_vendor}/diff) >= 1.2
-Requires:       php-composer(%{pk_vendor}/diff) <  2
-Requires:       php-composer(%{pk_vendor}/exporter) >= 3.0
+Requires:       php-composer(%{pk_vendor}/diff) >= 2.0
+Requires:       php-composer(%{pk_vendor}/diff) <  3
+Requires:       php-composer(%{pk_vendor}/exporter) >= 3.1
 Requires:       php-composer(%{pk_vendor}/exporter) <  4
-# from phpcompatinfo report for version 2.0.0
+# from phpcompatinfo report for version 2.1.0
 Requires:       php-date
 Requires:       php-dom
 Requires:       php-spl
@@ -81,7 +83,7 @@ phpab --template fedora --output src/autoload.php src
 cat <<EOF | tee -a src/autoload.php
 
 // Dependencies' autoloaders
-require_once '%{ns_vendor}/Diff/autoload.php';
+require_once '%{ns_vendor}/Diff2/autoload.php';
 require_once '%{ns_vendor}/Exporter3/autoload.php';
 EOF
 
@@ -98,9 +100,9 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in php70 php71 php; do
+for cmd in php php70 php71 php72; do
   if which $cmd; then
-    %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \
+    $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
     %{_bindir}/phpunit6 --no-coverage --verbose || ret=1
   fi
 done
@@ -119,6 +121,18 @@ exit $ret
 
 
 %changelog
+* Fri Nov  3 2017 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- Update to 2.1.0
+- raise dependency on sebastian/exporter 3.1
+
+* Fri Aug  4 2017 Remi Collet <remi@remirepo.net> - 2.0.2-1
+- Update to 2.0.2
+- raise dependency on sebastian/diff 2.0
+- raise various dependencies on latest minor version
+
+* Wed Jul 12 2017 Remi Collet <remi@remirepo.net> - 2.0.1-1
+- Update to 2.0.1
+
 * Fri Mar  3 2017 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
 - update to 3.0.0
 - rename to php-sebastian-comparator2