summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION6
-rw-r--r--php-pecl-couchbase2-dev.spec32
-rw-r--r--php-pecl-couchbase2.spec2
3 files changed, 27 insertions, 13 deletions
diff --git a/REFLECTION b/REFLECTION
index 6d44d00..dea1a9d 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,8 @@
-Extension [ <persistent> extension #186 couchbase version 2.1.0 ] {
+Extension [ <persistent> extension #195 couchbase version 2.2.0beta2 ] {
+
+ - Dependencies {
+ Dependency [ json (Required) ]
+ }
- Constants [57] {
Constant [ integer COUCHBASE_PERSISTTO_MASTER ] { 1 }
diff --git a/php-pecl-couchbase2-dev.spec b/php-pecl-couchbase2-dev.spec
index 25d664c..ba41744 100644
--- a/php-pecl-couchbase2-dev.spec
+++ b/php-pecl-couchbase2-dev.spec
@@ -10,7 +10,7 @@
%{?scl: %scl_package php-pecl-couchbase2}
%global pecl_name couchbase
-%global with_zts 0%{?__ztsphp:1}
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%if "%{php_version}" < "5.6"
# After igbinary (and XDebug for 5.4)
@@ -19,21 +19,20 @@
# After 40-igbinary and 40-json
%global ini_name 50-%{pecl_name}.ini
%endif
+%global prever beta2
Summary: Couchbase Server PHP extension
Name: %{?scl_prefix}php-pecl-couchbase2
-Version: 2.1.0
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 2.2.0
+Release: 0.1.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
Group: Development/Languages
URL: pecl.php.net/package/couchbase
-Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?svnrev:-dev}.tgz
-
-# Build with system fastlz
-Patch0: %{pecl_name}-fastlz.patch
+Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
BuildRequires: %{?scl_prefix}php-devel >= 5.3.0
BuildRequires: %{?scl_prefix}php-pear
+BuildRequires: %{?scl_prefix}php-json
BuildRequires: libcouchbase-devel
BuildRequires: fastlz-devel
BuildRequires: zlib-devel
@@ -43,7 +42,6 @@ BuildRequires: %{?scl_prefix}php-pecl-xdebug
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
# used in embded php code
-# TODO fastlz http://www.couchbase.com/issues/browse/PCBC-293
Requires: %{?scl_prefix}php-igbinary%{?_isa}
Requires: %{?scl_prefix}php-json%{?_isa}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
@@ -52,10 +50,16 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
Provides: %{?scl_prefix}php-pecl-%{pecl_name}2 = %{version}-%{release}
Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release}
+%endif
+%if "%{php_version}" > "7.0"
+Obsoletes: %{?scl_prefix}php-pecl-couchbase < 2
+%else
# Only 1 version can be installed
Conflicts: %{?scl_prefix}php-pecl-couchbase < 2
+%endif
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
@@ -100,7 +104,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
%setup -q -c
-mv %{pecl_name}-%{version} NTS
+mv %{pecl_name}-%{version}%{?prever} NTS
%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
@@ -108,12 +112,11 @@ cd NTS
# Drop bundled library
sed -e '/fastlz/d' -i ../package.xml
rm -r fastlz
-%patch0 -p1 -b .sysfast
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_COUCHBASE_VERSION/{s/.* "//;s/".*$//;p}' php_couchbase.h)
-if test "x${extver}" != "x%{version}"; then
- : Error: Upstream extension version is ${extver}, expecting %{version}..
+if test "x${extver}" != "x%{version}%{?prever}"; then
+ : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}
exit 1
fi
cd ..
@@ -175,12 +178,14 @@ done
%check
: minimal NTS load test
%{__php} -n \
+ -d extension=json.so \
-d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-m | grep %{pecl_name}
%if %{with_zts}
: minimal ZTS load test
%{__ztsphp} -n \
+ -d extension=json.so \
-d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-m | grep %{pecl_name}
%endif
@@ -222,6 +227,9 @@ fi
%changelog
+* Wed Mar 20 2016 Remi Collet <remi@fedoraproject.org> - 2.2.0-0.1.beta1
+- Update to 2.2.0beta2 (php 5 and 7, beta)
+
* Tue Mar 8 2016 Remi Collet <remi@fedoraproject.org> - 2.1.0-2
- adapt for F24
diff --git a/php-pecl-couchbase2.spec b/php-pecl-couchbase2.spec
index 25d664c..efaadab 100644
--- a/php-pecl-couchbase2.spec
+++ b/php-pecl-couchbase2.spec
@@ -52,8 +52,10 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
Provides: %{?scl_prefix}php-pecl-%{pecl_name}2 = %{version}-%{release}
Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release}
+%endif
# Only 1 version can be installed
Conflicts: %{?scl_prefix}php-pecl-couchbase < 2