diff options
| -rw-r--r-- | php-pecl-cassandra.spec | 61 |
1 files changed, 23 insertions, 38 deletions
diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec index 0a15907..2e7c54a 100644 --- a/php-pecl-cassandra.spec +++ b/php-pecl-cassandra.spec @@ -15,7 +15,7 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} #global prever RC # see https://github.com/datastax/php-driver/releases -#global gh_commit 84035aa9d81c7c3b53f2f3461949e2bbdd300f46 +#global gh_commit 2b0642b1d6fc451f0481edaf0163e3e5bbf896ec #global gh_short %%(c=%%{gh_commit}; echo ${c:0:7}) %global gh_owner datastax %global gh_project php-driver @@ -31,8 +31,8 @@ Summary: DataStax PHP Driver for Apache Cassandra Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.3.0 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.1.0 +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: ASL 2.0 Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -44,9 +44,11 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/ Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif -BuildRequires: %{?scl_prefix}php-devel >= 5.6 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Upstream recommends php >= 5.5 +BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear -BuildRequires: cassandra-cpp-driver-devel >= 2.6.0 +BuildRequires: cassandra-cpp-driver-devel BuildRequires: libuv-devel BuildRequires: gmp-devel @@ -55,14 +57,12 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_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_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} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff @@ -70,8 +70,10 @@ Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} +%endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} @@ -80,10 +82,6 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} %endif -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -117,7 +115,7 @@ sed -e 's/role="test"/role="src"/' \ cd NTS # Sanity check, really often broken -extver=$(sed -n '/#define PHP_DRIVER_VERSION /{s/.* "//;s/".*$//;p}' version.h) +extver=$(sed -n '/#define PHP_CASSANDRA_VERSION /{s/.* "//;s/".*$//;p}' version.h) if test "x${extver}" != "x%{version}%{?prever}"; then : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}. exit 1 @@ -161,6 +159,8 @@ make %{?_smp_mflags} %install %{?dtsenable} +rm -rf %{buildroot} + make -C NTS install INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration @@ -180,6 +180,10 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done +%clean +rm -rf %{buildroot} + + %if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear @@ -235,6 +239,7 @@ REPORT_EXIT_STATUS=1 \ %files +%defattr(-, root, root, -) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -249,29 +254,9 @@ REPORT_EXIT_STATUS=1 \ %changelog -* Thu Mar 16 2017 Remi Collet <remi@remirepo.net> - 1.3.0-1 -- Update to 1.3.0 -- raise dependency on PHP 5.6 -- raise dependency on cassandra-cpp-driver >= 2.6.0 - -* Wed Jan 4 2017 Remi Collet <remi@fedoraproject.org> - 1.2.2-4 +* Wed Jan 4 2017 Remi Collet <remi@fedoraproject.org> - 1.1.0-2 - rebuild against new libuv (EL-7) -* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-3 -- rebuild with PHP 7.1.0 GA - -* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-2 -- rebuild for PHP 7.1 new API version - -* Tue Aug 09 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-1 -- Update to 1.2.2 (stable) - -* Thu Jul 28 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1 -- Update to 1.2.1 (no change) - -* Wed Jul 27 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1 -- Update to 1.2.0 - * Fri Feb 12 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-1 - Update to 1.1.0 |