From f7736b766c7761d03cbff0707c8e26f74f7596ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2017 15:11:35 +0200 Subject: rebuild --- php-pecl-cassandra.spec | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec index 2e7c54a..8f747e9 100644 --- a/php-pecl-cassandra.spec +++ b/php-pecl-cassandra.spec @@ -32,7 +32,7 @@ Summary: DataStax PHP Driver for Apache Cassandra Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.1.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?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,7 +44,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/ Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Upstream recommends php >= 5.5 BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -52,17 +51,19 @@ BuildRequires: cassandra-cpp-driver-devel BuildRequires: libuv-devel BuildRequires: gmp-devel -Requires: cassandra-cpp-driver-devel%{?_isa} >= %{buildver} +Requires: cassandra-cpp-driver%{?_isa} >= %{buildver} 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} -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +%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 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff @@ -159,8 +160,6 @@ make %{?_smp_mflags} %install %{?dtsenable} -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # Drop in the bit of configuration @@ -180,10 +179,6 @@ 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 @@ -239,7 +234,6 @@ REPORT_EXIT_STATUS=1 \ %files -%defattr(-, root, root, -) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -254,6 +248,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed May 24 2017 Remi Collet - 1.1.0-3 +- rebuild against new cassandra-cpp-driver + * Wed Jan 4 2017 Remi Collet - 1.1.0-2 - rebuild against new libuv (EL-7) -- cgit