back to v2

1 files changed, 54 insertions, 121 deletions

diff --git a/php-pecl-couchbase3.spec b/php-pecl-couchbase3.spec
index 76a95c8..a91d8ff 100644
--- a/php-pecl-couchbase3.spec
+++ b/php-pecl-couchbase3.spec
@@ -1,4 +1,7 @@
-# remirepo spec file for php-pecl-couchbase3
+# Fedora spec file for php-pecl-couchbase2
+# without SCL compatibility from:
+#
+# remirepo spec file for php-pecl-couchbase2
 #
 # Copyright (c) 2013-2020 Remi Collet
 # License: CC-BY-SA
@@ -10,80 +13,47 @@
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
 
-%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}}
 # After 20-tokenizer.ini, 40-igbinary and 40-json
 %global ini_name  50-%{pecl_name}.ini
-#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-couchbase3
-Version:       3.0.4
-Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Name:          php-pecl-couchbase2
+Version:       2.6.2
+Release:       2%{?dist}
 License:       PHP
 URL:           https://pecl.php.net/package/couchbase
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
-Patch0:        https://patch-diff.githubusercontent.com/raw/couchbase/php-couchbase/pull/31.patch
-
-BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel >= 7.2
-BuildRequires: %{?scl_prefix}php-pear
-BuildRequires: %{?scl_prefix}php-json
-BuildRequires: %{?scl_prefix}php-tokenizer
-BuildRequires: pkgconfig(libcouchbase) >= 3.0.0
+BuildRequires: gcc
+BuildRequires: php-devel >= 5.6
+BuildRequires: php-pear
+BuildRequires: php-pecl-igbinary-devel
+BuildRequires: php-json
+BuildRequires: php-tokenizer
+BuildRequires: pkgconfig(libcouchbase) >= 2.9.5
 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-tokenizer%{?_isa}
-%{?_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
-Obsoletes:     %{?scl_prefix}php-pecl-couchbase          < 3
-Provides:      %{?scl_prefix}php-pecl-couchbase          = %{version}
-Provides:      %{?scl_prefix}php-pecl-couchbase%{?_isa}  = %{version}
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9 || "%{php_version}" > "8.0"
-Obsoletes:     %{?scl_prefix}php-pecl-couchbase2         < 3
-Provides:      %{?scl_prefix}php-pecl-couchbase2         = %{version}
-Provides:      %{?scl_prefix}php-pecl-couchbase2%{?_isa} = %{version}
-%else
-# Only 1 version can be installed
-Conflicts:     %{?scl_prefix}php-pecl-couchbase  < 3
-Conflicts:     %{?scl_prefix}php-pecl-couchbase2 < 3
-%endif
+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}
+
+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 "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes:     php73-pecl-%{pecl_name}  <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:     php74-pecl-%{pecl_name}  <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
-%endif
-%endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
 # Filter private shared
@@ -96,11 +66,6 @@ Obsoletes:     php80-pecl-%{pecl_name}  <= %{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.
-
-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
@@ -109,10 +74,6 @@ mv %{pecl_name}-%{version}%{?prever} NTS
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
-%if "%{php_version}" > "8.0"
-%patch0 -p1 -b .pr31
-%endif
-
 # Drop bundled library
 sed -e '/fastlz/d' -i ../package.xml
 rm -r fastlz
@@ -137,7 +98,6 @@ extension=%{pecl_name}.so
 ;couchbase.encoder.compression_factor = 0.0
 ;couchbase.decoder.json_arrays = 0
 ;couchbase.pool.max_idle_time_sec = 60
-;couchbase.allow_fallback_to_bucket_connection = 0
 EOF
 
 %if 0%{?__ztsphp:1}
@@ -149,8 +109,6 @@ cp -pr NTS ZTS
 
 
 %build
-%{?dtsenable}
-
 peclconf() {
 %configure \
      --with-system-fastlz \
@@ -171,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}
@@ -197,6 +153,7 @@ done
 : minimal NTS load test
 %{__php} -n \
    -d extension=tokenizer.so \
+   -d extension=igbinary.so \
    -d extension=json.so \
    -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
    -m | grep %{pecl_name}
@@ -205,33 +162,15 @@ done
 : minimal ZTS load test
 %{__ztsphp} -n \
    -d extension=tokenizer.so \
+   -d extension=igbinary.so \
    -d extension=json.so \
    -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
    -m | grep %{pecl_name}
 %endif
 
 
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-%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
 
@@ -246,53 +185,41 @@ fi
 
 
 %changelog
-* Fri Nov 13 2020 Remi Collet <remi@remirepo.net> - 3.0.4-2
-- add patch for PHP 8 from
-  https://github.com/couchbase/php-couchbase/pull/31
-- open https://github.com/couchbase/php-couchbase/pull/30 min PHP version
-- open https://github.com/couchbase/php-couchbase/pull/29 pkg-config
-
-* Thu Nov 12 2020 Remi Collet <remi@remirepo.net> - 3.0.4-1
-- update to 3.0.4
-- rename to php-pecl-couchbase3
-- raise dependency on PHP 7.1
-- raise dependency on libcouchbase 3.0
-- drop dependency on igbinary extension
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 2.6.2-1
 - update to 2.6.2
 
-* Tue Jan 28 2020 Remi Collet <remi@remirepo.net> - 2.6.1-4
-- add upstream patch to fix segfault in timeout
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.6.1-3
-- rebuild against libcouchase 2.10.5 for
-  https://github.com/remicollet/remirepo/issues/136
+* Thu Oct 03 2019 Remi Collet <remi@remirepo.net> - 2.6.1-3
+- rebuild for https://fedoraproject.org/wiki/Changes/php74
 
-* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 2.6.1-2
-- rebuild for 7.4.0RC1
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Mon Jun  3 2019 Remi Collet <remi@remirepo.net> - 2.6.1-1
 - update to 2.6.1
 
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 11 2018 Remi Collet <remi@remirepo.net> - 2.6.0-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/php73
+
 * Sat Oct  6 2018 Remi Collet <remi@remirepo.net> - 2.6.0-1
 - update to 2.6.0
 - raise dependency on libcouchbase 2.9.5
 
-* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 2.5.0-3
-- rebuild for 7.3.0beta2 new ABI
-
-* Tue Jul 17 2018 Remi Collet <remi@remirepo.net> - 2.5.0-2
-- rebuld for 7.3.0alpha4 new ABI
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Thu Jul  5 2018 Remi Collet <remi@remirepo.net> - 2.5.0-1
 - update to 2.5.0
 - raise dependency on libcouchbase 2.9.2
 
-* Fri Jun 22 2018 Remi Collet <remi@remirepo.net> - 2.4.7-2
-- add patch for PHP 7.3 from
-  https://github.com/couchbase/php-couchbase/pull/22
-
 * Fri Jun  8 2018 Remi Collet <remi@remirepo.net> - 2.4.7-1
 - update to 2.4.7
 - raise dependency on libcouchbase 2.9.0
@@ -307,6 +234,12 @@ fi
 * Tue Feb 13 2018 Remi Collet <remi@remirepo.net> - 2.4.4-1
 - Update to 2.4.4
 
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan  5 2018 Remi Collet <remi@remirepo.net> - 2.4.3-2
+- cleanup for Fedora review
+
 * Fri Jan  5 2018 Remi Collet <remi@remirepo.net> - 2.4.3-1
 - Update to 2.4.3
 - raise dependency on libcouchbase 2.8.4