From 0c6e06a2f5f5f59d4d4a5a3106096d7e97625648 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Feb 2018 09:04:26 +0100 Subject: Update to 1.3.0 raise dependency on mongodb extension 1.4.0 --- composer.json | 13 +++++++++---- php-mongodb.spec | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 7c772ca..11d5c2d 100644 --- a/composer.json +++ b/composer.json @@ -5,18 +5,18 @@ "homepage": "https://jira.mongodb.org/browse/PHPLIB", "license": "Apache-2.0", "authors": [ - { "name": "Hannes Magnusson", "email": "bjori@mongodb.com" }, { "name": "Jeremy Mikola", "email": "jmikola@gmail.com" }, - { "name": "Derick Rethans", "email": "github@derickrethans.nl" } + { "name": "Derick Rethans", "email": "github@derickrethans.nl" }, + { "name": "Katherine Walker", "email": "katherine.walker@mongodb.com" } ], "require": { "php": ">=5.5", "ext-hash": "*", "ext-json": "*", - "ext-mongodb": "^1.3.0" + "ext-mongodb": "^1.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^4.8.36" }, "autoload": { "psr-4": { "MongoDB\\": "src/" }, @@ -24,5 +24,10 @@ }, "autoload-dev": { "psr-4": { "MongoDB\\Tests\\": "tests/" } + }, + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } } } diff --git a/php-mongodb.spec b/php-mongodb.spec index 3cdab9f..5a3dc23 100644 --- a/php-mongodb.spec +++ b/php-mongodb.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-mongodb # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 5cffeb33b893b6bb04195b99ddc3955a29252339 +%global gh_commit 07ffd2438658342b776803323cfaa7c156a6099a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mongodb #global gh_date 20151102 @@ -14,16 +14,11 @@ # Upstream only support 64bits, see https://jira.mongodb.org/browse/CDRIVER-1186 # Server only available on LE arch (ExcludeArch: ppc ppc64 %%{sparc} s390 s390x) %global with_tests 0%{?_with_tests:1} -# remirepo:4 -# encoutent too many openfile error in F27 with 3.4 -%if 0%{?fedora} < 27 -%global with_tests 0%{!?_without_tests:1} -%endif %global psr0 MongoDB #global prever beta2 Name: php-%{gh_owner} -Version: 1.2.0 +Version: 1.3.0 %if 0%{?gh_date} Release: 1%{gh_date}git%{gh_short}%{?dist} %else @@ -31,7 +26,6 @@ Release: 1%{?dist} %endif Summary: MongoDB driver library -Group: Development/Libraries 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 @@ -48,8 +42,8 @@ BuildRequires: php-spl BuildRequires: php-pecl(mongodb) >= 1.3.0 BuildRequires: mongodb-server >= 2.4 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^4.8" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8 +# "phpunit/phpunit": "^4.8.36" +BuildRequires: php-composer(phpunit/phpunit) >= 4.8.36 # For autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -62,7 +56,7 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= 5.4 Requires: php-hash Requires: php-json -Requires: php-pecl(mongodb) >= 1.3.0 +Requires: php-pecl(mongodb) >= 1.4.0 # From phpcompatinfo report for 1.2.0 Requires: php-spl # For autoloader @@ -152,6 +146,10 @@ exit $ret %changelog +* Fri Feb 9 2018 Remi Collet - 1.3.0-1 +- Update to 1.3.0 +- raise dependency on mongodb extension 1.4.0 + * Tue Nov 14 2017 Remi Collet - 1.2.0-1 - Update to 1.2.0 - raise dependency on PHP 5.5 -- cgit