From 4f4830507be892843dd25d0f83af9b0e8806a593 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Mar 2016 18:08:29 +0200 Subject: php-pecl-mongodb: load after smbclient --- php-pecl-mongodb-dev.spec | 17 +++++++++++------ php-pecl-mongodb.spec | 11 ++++++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/php-pecl-mongodb-dev.spec b/php-pecl-mongodb-dev.spec index 81f8df7..e6d8182 100644 --- a/php-pecl-mongodb-dev.spec +++ b/php-pecl-mongodb-dev.spec @@ -11,9 +11,10 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name mongodb %if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini +%global ini_name z-%{pecl_name}.ini %else -%global ini_name 40-%{pecl_name}.ini +# After 40-smbclient.ini, see https://jira.mongodb.org/browse/PHPC-658 +%global ini_name 50-%{pecl_name}.ini %endif #global prever RC0 # Still needed because of some private API @@ -22,7 +23,7 @@ Summary: MongoDB driver for PHP Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.1.5 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -218,13 +219,17 @@ cd ../ZTS %changelog -* Fri Mar 18 2016 Remi Collet - 1.1.5-1 +* Thu Mar 31 2016 Remi Collet - 1.1.5-4 +- load after smbclient to workaround + https://jira.mongodb.org/browse/PHPC-658 + +* Fri Mar 18 2016 Remi Collet - 1.1.5-2 - Update to 1.1.5 (stable) -* Thu Mar 10 2016 Remi Collet - 1.1.4-1 +* Thu Mar 10 2016 Remi Collet - 1.1.4-2 - Update to 1.1.4 (stable) -* Sat Mar 5 2016 Remi Collet - 1.1.3-1 +* Sat Mar 5 2016 Remi Collet - 1.1.3-2 - Update to 1.1.3 (stable) * Thu Jan 07 2016 Remi Collet - 1.1.2-2 diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec index 29ec735..d04b679 100644 --- a/php-pecl-mongodb.spec +++ b/php-pecl-mongodb.spec @@ -12,9 +12,10 @@ %global with_zts 0%{?__ztsphp:1} %global pecl_name mongodb %if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini +%global ini_name z-%{pecl_name}.ini %else -%global ini_name 40-%{pecl_name}.ini +# After 40-smbclient.ini, see https://jira.mongodb.org/browse/PHPC-658 +%global ini_name 50-%{pecl_name}.ini %endif # Still needed because of some private API %global buildver %(pkg-config --silence-errors --modversion libmongoc-priv 2>/dev/null || echo 65536) @@ -22,7 +23,7 @@ Summary: MongoDB driver for PHP Name: php-pecl-%{pecl_name} Version: 1.1.5 -Release: 1%{?dist} +Release: 3%{?dist} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -193,6 +194,10 @@ cd ../ZTS %changelog +* Thu Mar 31 2016 Remi Collet - 1.1.5-3 +- load after smbclient to workaround + https://jira.mongodb.org/browse/PHPC-658 + * Fri Mar 18 2016 Remi Collet - 1.1.5-1 - Update to 1.1.5 (stable) -- cgit