update to 1.6.0

raise dependency on mongodb extension 1.7

2 files changed, 20 insertions, 13 deletions

diff --git a/composer.json b/composer.json
index 41d0e32..aaab8b5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "php": "^5.6 || ^7.0",
         "ext-hash": "*",
         "ext-json": "*",
-        "ext-mongodb": "^1.6"
+        "ext-mongodb": "^1.7"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7.27 || ^6.4 || ^8.3",
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev"
+            "dev-master": "1.6.x-dev"
         }
     }
 }
diff --git a/php-mongodb.spec b/php-mongodb.spec
index 50ac0d3..060a20b 100644
--- a/php-mongodb.spec
+++ b/php-mongodb.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    9480f994de9f70e2ae5a946b21e6fc04bf5a6c3c
+%global gh_commit    dc43ba25fb593d6a2988e6a535b6f5386eda5b15
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     mongodb
 #global gh_date      20151102
@@ -17,7 +17,7 @@
 #global prever       beta2
 
 Name:           php-%{gh_owner}
-Version:        1.5.2
+Version:        1.6.0
 %if 0%{?gh_date}
 Release:        1%{gh_date}git%{gh_short}%{?dist}
 %else
@@ -33,38 +33,35 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 Source1:        %{name}-autoload.php
 
 BuildArch:      noarch
-%if %{with_tests}
 BuildRequires:  php(language) >= 5.6
+BuildRequires:  php-cli
 BuildRequires:  php-date
 BuildRequires:  php-hash
 BuildRequires:  php-json
 BuildRequires:  php-spl
-BuildRequires:  php-pecl(mongodb) >= 1.6
+BuildRequires:  php-pecl(mongodb) >= 1.7
+%if %{with_tests}
 BuildRequires:  mongodb-server >= 2.4
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^5.7.27 || ^6.4 || ^8.3",
 #        "sebastian/comparator": "^1.0 || ^2.0 || ^3.0",
 #        "squizlabs/php_codesniffer": "^3.4",
 #        "symfony/phpunit-bridge": "^4.4@dev"
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 %global phpunit %{_bindir}/phpunit8
-%else
-%global phpunit %{_bindir}/phpunit
-%endif
 BuildRequires:  %{phpunit}
+%endif
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader)
-%endif
 
 # From composer.json, "require": {
 #        "php": "^5.6 || ^7.0"
 #        "ext-hash": "*",
 #        "ext-json": "*",
-#        "ext-mongodb": "^1.6"
+#        "ext-mongodb": "^1.7"
 Requires:       php(language) >= 5.6
 Requires:       php-hash
 Requires:       php-json
-Requires:       php-pecl(mongodb) >= 1.6
+Requires:       php-pecl(mongodb) >= 1.7
 # From phpcompatinfo report for 1.5.0
 Requires:       php-date
 Requires:       php-spl
@@ -104,6 +101,12 @@ cp -pr src %{buildroot}%{_datadir}/php/%{psr0}
 
 
 %check
+: Check autoloader
+php -r '
+require_once "%{buildroot}%{_datadir}/php/%{psr0}/autoload.php";
+exit (class_exists("%{psr0}\\Client") ? 0 : 1);
+'
+
 %if %{with_tests}
 : Run a server
 mkdir dbtest
@@ -157,6 +160,10 @@ exit $ret
 
 
 %changelog
+* Wed Feb  5 2020 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- update to 1.6.0
+- raise dependency on mongodb extension 1.7
+
 * Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.5.2-1
 - update to 1.5.2