From 66e3065202451517404b0dbb3b3c41667dce746f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Jan 2018 09:11:25 +0100 Subject: cleanup for review --- php-pecl-couchbase2.spec | 125 ++++++++++++----------------------------------- 1 file changed, 30 insertions(+), 95 deletions(-) diff --git a/php-pecl-couchbase2.spec b/php-pecl-couchbase2.spec index c419428..5a1316b 100644 --- a/php-pecl-couchbase2.spec +++ b/php-pecl-couchbase2.spec @@ -1,3 +1,6 @@ +# Fedora spec file for php-pecl-couchbase2 +# without SCL compatibility from: +# # remirepo spec file for php-pecl-couchbase2 # # Copyright (c) 2013-2018 Remi Collet @@ -6,89 +9,48 @@ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-couchbase2 -%endif %global pecl_name couchbase %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} - -%if "%{php_version}" < "5.6" -# After igbinary, (and XDebug for 5.4) -%global ini_name z-%{pecl_name}.ini -%else -# After 40-igbinary and 40-json +# After 20-tokenizer.ini, 40-igbinary and 40-json %global ini_name 50-%{pecl_name}.ini -%endif -#global prever beta4 %global libbuildver %(pkg-config --silence-errors --modversion libcouchbase 2>/dev/null || echo 65536) Summary: Couchbase Server PHP extension -Name: %{?sub_prefix}php-pecl-couchbase2 +Name: php-pecl-couchbase2 Version: 2.4.3 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist} License: PHP Group: Development/Languages URL: pecl.php.net/package/couchbase Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRequires: %{?scl_prefix}php-devel >= 5.6 -BuildRequires: %{?scl_prefix}php-pear -BuildRequires: %{?scl_prefix}php-pecl-igbinary-devel -BuildRequires: %{?scl_prefix}php-json +BuildRequires: php-devel >= 5.6 +BuildRequires: php-pear +BuildRequires: php-pecl-igbinary-devel +BuildRequires: php-json +BuildRequires: php-tokenizer BuildRequires: pkgconfig(libcouchbase) >= 2.8.4 BuildRequires: fastlz-devel BuildRequires: zlib-devel -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -Requires: %{?scl_prefix}php-json%{?_isa} -Requires: %{?scl_prefix}php-igbinary%{?_isa} +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +Requires: php-json%{?_isa} +Requires: php-igbinary%{?_isa} +Requires: php-tokenizer%{?_isa} Requires: libcouchbase%{?_isa} >= %{libbuildver} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} - -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 -Provides: %{?scl_prefix}php-pecl-couchbase = %{version} -Provides: %{?scl_prefix}php-pecl-couchbase%{?_isa} = %{version} -%else -# Only 1 version can be installed -Conflicts: %{?scl_prefix}php-pecl-couchbase < 2 -%endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php53u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php54-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php54w-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php55u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php55w-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php56u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php56w-pecl-%{pecl_name}2 <= %{version} -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php70w-pecl-%{pecl_name}2 <= %{version} -%endif -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php71w-pecl-%{pecl_name}2 <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php72w-pecl-%{pecl_name}2 <= %{version} -%endif -%endif +Provides: php-%{pecl_name} = %{version} +Provides: php-%{pecl_name}%{?_isa} = %{version} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +# Was renamed +Obsoletes: php-pecl-couchbase < 2 +Provides: php-pecl-couchbase = %{version} +Provides: php-pecl-couchbase%{?_isa} = %{version} + %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Filter private shared @@ -101,17 +63,10 @@ Obsoletes: php72w-pecl-%{pecl_name}2 <= %{version} The PHP client library provides fast access to documents stored in a Couchbase Server. -%{?scl_prefix}php-pecl-couchbase provides API version 1. -This package provides API version 2. - -Documentation: -http://docs.couchbase.com/prebuilt/php-sdk-2.0/topics/overview.html - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - %prep %setup -q -c +# override the old PHP 4 metadata file [ -f package2.xml ] && mv package2.xml package.xml mv %{pecl_name}-%{version}%{?prever} NTS @@ -154,8 +109,6 @@ cp -pr NTS ZTS %build -%{?dtsenable} - peclconf() { %configure \ --with-system-fastlz \ @@ -176,8 +129,6 @@ make %{?_smp_mflags} %install -%{?dtsenable} - # Install the NTS stuff make install -C NTS INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -218,27 +169,8 @@ done %endif -%if 0%{?fedora} < 24 -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %files -%{?_licensedir:%license NTS/LICENSE} +%license NTS/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -253,6 +185,9 @@ fi %changelog +* Fri Jan 5 2018 Remi Collet - 2.4.3-2 +- cleanup for Fedora review + * Fri Jan 5 2018 Remi Collet - 2.4.3-1 - Update to 2.4.3 - raise dependency on libcouchbase 2.8.4 -- cgit