diff options
| author | Remi Collet <remi@remirepo.net> | 2017-09-05 16:03:15 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-09-05 16:03:15 +0200 |
| commit | 4be2bc4d09c86094fc527aafdc5451f0460dab5d (patch) | |
| tree | 5bd6037c170b3912c5a511fc33882d717b38c1da | |
| parent | 0bfe134abfae6e174fca392e4a7e620431c711ae (diff) | |
Update to 1.6.16
drop patch merged upstream
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 883.patch | 23 | ||||
| -rw-r--r-- | REFLECTION | 6 | ||||
| -rw-r--r-- | php-pecl-mongo.spec | 13 |
4 files changed, 10 insertions, 33 deletions
@@ -1,3 +1,4 @@ +clog package-*.xml *.tgz *.tar.gz diff --git a/883.patch b/883.patch deleted file mode 100644 index e36576f..0000000 --- a/883.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8cffa3a1a1d0dcdf8178f1650376b902e396e3a0 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 4 Sep 2017 08:18:55 +0200 -Subject: [PATCH] PHP-1529: read config.h to rerieve HAVE_MONGO_OPENSSL - ---- - contrib/php-ssl.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/contrib/php-ssl.c b/contrib/php-ssl.c -index 944a62c60..5bdd935fa 100644 ---- a/contrib/php-ssl.c -+++ b/contrib/php-ssl.c -@@ -18,6 +18,9 @@ - +----------------------------------------------------------------------+ - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif - - #ifdef PHP_WIN32 - # include "config.w32.h" @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #83 mongo version 1.6.15 ] { +Extension [ <persistent> extension #83 mongo version 1.6.16 ] { - Dependencies { Dependency [ openssl (Optional) ] @@ -77,7 +77,7 @@ Extension [ <persistent> extension #83 mongo version 1.6.15 ] { - Constants [8] { Constant [ string DEFAULT_HOST ] { localhost } Constant [ integer DEFAULT_PORT ] { 27017 } - Constant [ string VERSION ] { 1.6.15 } + Constant [ string VERSION ] { 1.6.16 } Constant [ string RP_PRIMARY ] { primary } Constant [ string RP_PRIMARY_PREFERRED ] { primaryPreferred } Constant [ string RP_SECONDARY ] { secondary } @@ -213,7 +213,7 @@ Extension [ <persistent> extension #83 mongo version 1.6.15 ] { - Constants [8] { Constant [ string DEFAULT_HOST ] { localhost } Constant [ integer DEFAULT_PORT ] { 27017 } - Constant [ string VERSION ] { 1.6.15 } + Constant [ string VERSION ] { 1.6.16 } Constant [ string RP_PRIMARY ] { primary } Constant [ string RP_PRIMARY_PREFERRED ] { primaryPreferred } Constant [ string RP_SECONDARY ] { secondary } diff --git a/php-pecl-mongo.spec b/php-pecl-mongo.spec index d4442f4..bed122c 100644 --- a/php-pecl-mongo.spec +++ b/php-pecl-mongo.spec @@ -17,7 +17,7 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} #global prever RC3 # see https://github.com/mongodb/mongo-php-driver-legacy/releases -%global gh_commit 026eaed503bc927b2ef6c79fd53314e07f44ddfb +%global gh_commit 3321e9849a3d17503707ded728586ce34d69fb69 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mongodb %global gh_project mongo-php-driver-legacy @@ -32,7 +32,7 @@ Summary: PHP MongoDB database driver Name: %{?scl_prefix}php-pecl-mongo -Version: 1.6.15 +Version: 1.6.16 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: ASL 2.0 Group: Development/Languages @@ -42,9 +42,6 @@ URL: http://pecl.php.net/package/%{pecl_name} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}.tar.gz Source1: %{pecl_name}.ini -# https://jira.mongodb.org/browse/PHP-1529 -Patch0: 883.patch - BuildRequires: %{?scl_prefix}php-devel < 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: cyrus-sasl-devel @@ -110,8 +107,6 @@ mv NTS/package.xml . %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 -b .pr883 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_MONGO_VERSION/{s/.* "//;s/".*$//;p}' php_mongo.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -249,6 +244,10 @@ rm -rf data %changelog +* Tue Sep 5 2017 Remi Collet <remi@remirepo.net> - 1.6.16-1 +- Update to 1.6.16 +- drop patch merged upstream + * Mon Sep 4 2017 Remi Collet <remi@remirepo.net> - 1.6.15-1 - Update to 1.6.15 - add patch to fix undefine symbol |