update to 1.9.0

raise dependency on mongodb extension version 1.10

2 files changed, 23 insertions, 14 deletions

diff --git a/composer.json b/composer.json
index c6e2822..2953ebb 100644
--- a/composer.json
+++ b/composer.json
@@ -12,13 +12,13 @@
         "php": "^7.0 || ^8.0",
         "ext-hash": "*",
         "ext-json": "*",
-        "ext-mongodb": "^1.8.1",
-        "jean85/pretty-package-versions": "^1.2",
+        "ext-mongodb": "^1.10.0",
+        "jean85/pretty-package-versions": "^1.2 || ^2.0.1",
         "symfony/polyfill-php80": "^1.19"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.5, <3.5.5",
-        "symfony/phpunit-bridge": "5.x-dev"
+        "symfony/phpunit-bridge": "^5.2"
     },
     "autoload": {
         "psr-4": { "MongoDB\\": "src/" },
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.8.x-dev"
+            "dev-master": "1.9.x-dev"
         }
     }
 }
diff --git a/php-mongodb.spec b/php-mongodb.spec
index 18b4811..261a054 100644
--- a/php-mongodb.spec
+++ b/php-mongodb.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-mongodb
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,16 +9,21 @@
 # disabled for https://fedoraproject.org/wiki/Changes/MongoDB_Removal
 %bcond_with          tests
 
-%global gh_commit    953dbc19443aa9314c44b7217a16873347e6840d
+%global gh_commit    8123216f21d31a2a5b845aa91fba7a182d060509
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     mongodb
 #global gh_date      20151102
 %global gh_project   mongo-php-library
 %global psr0         MongoDB
-#global prever       beta2
+
+%global upstream_version 1.9.0
+%global upstream_prever  alpha1
+%global upstream_lower   alpha1
+
+%global ext_version      1.10
 
 Name:           php-%{gh_owner}
-Version:        1.8.0
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 %if 0%{?gh_date}
 Release:        1%{gh_date}git%{gh_short}%{?dist}
 %else
@@ -28,7 +33,7 @@ Summary:        MongoDB driver library
 
 License:        ASL 2.0
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{?gh_short}.tar.gz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
 
 # Get rid of jean85/pretty-package-versions
 Patch0:         %{name}-rpm.patch
@@ -42,7 +47,6 @@ BuildRequires:  php-dom
 BuildRequires:  php-hash
 BuildRequires:  php-json
 BuildRequires:  php-spl
-BuildRequires:  php-pecl(mongodb) >= 1.8.1
 # remirepo:1
 %if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
@@ -53,6 +57,7 @@ BuildRequires:  php-symfony-polyfill                 >= 1.19
 %endif
 %if %{with tests}
 BuildRequires:  mongodb-server >= 2.4
+BuildRequires:  php-pecl(mongodb) >= %{ext_version}
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^6.4 || ^8.3",
 #        "sebastian/comparator": "^2.0 || ^3.0",
@@ -73,12 +78,12 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "ext-hash": "*",
 #        "ext-json": "*",
 #        "ext-mongodb": "^1.8.1"
-#        "jean85/pretty-package-versions": "^1.2"
+#        "jean85/pretty-package-versions": "^1.2 || ^2.0.1"
 #        "symfony/polyfill-php80": "^1.19"
 Requires:       php(language) >= 7.0
 Requires:       php-hash
 Requires:       php-json
-Requires:       php-pecl(mongodb) >= 1.8.1
+Requires:       php-pecl(mongodb) >= %{ext_version}
 # remirepo:1
 %if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
 Requires:      (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
@@ -128,9 +133,9 @@ EOF
 
 # Get rid of jean85/pretty-package-versions
 %patch0 -p1 -b .rpm
-sed -e 's/@VERSION@/%{version}/' -i src/Client.php
+sed -e 's/@VERSION@/%{upstream_version}%{?upstream_prever:-%{upstream_lower}}/' -i src/Client.php
 find src -name \*.rpm -delete
-grep -F '%{version}' src/Client.php
+grep -F '%{upstream_version}' src/Client.php
 
 
 %build
@@ -203,6 +208,10 @@ exit $ret
 
 
 %changelog
+* Fri Apr  9 2021 Remi Collet <remi@remirepo.net> - 1.9.0~alpha1-1
+- update to 1.9.0
+- raise dependency on mongodb extension version 1.10
+
 * Wed Nov 25 2020 Remi Collet <remi@remirepo.net> - 1.8.0-1
 - update to 1.8.0
 - raise dependency on mongodb extension 1.8.1