From 2013b9a9282c6ecbccdc0b998334547756fd2948 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 6 Mar 2016 09:04:09 +0100 Subject: php-pecl-yar: F24 --- php-pecl-yar-php7.spec | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/php-pecl-yar-php7.spec b/php-pecl-yar-php7.spec index 079517d..4e09e28 100644 --- a/php-pecl-yar-php7.spec +++ b/php-pecl-yar-php7.spec @@ -7,17 +7,10 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} %endif -%endif %{?scl: %scl_package php-pecl-yar} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global gh_commit 0e04a6a92347f7e95c9ddf8bbbad36b6286ed87f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -41,16 +34,15 @@ Version: 2.0.0 %if 0%{?gh_date:1} Release: 0.10.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?sub_prefix}php-pecl-msgpack-devel @@ -68,10 +60,12 @@ Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?scl_prefix}php-pecl(msgpack)%{?_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_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 "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff @@ -79,19 +73,13 @@ 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} -%endif -%if "%{php_version}" > "7.0" Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} %endif -%endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 # Filter shared private @@ -114,6 +102,7 @@ mv NTS/package2.xml . # Don't install/register tests sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package2.xml cd NTS @@ -171,8 +160,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS \ install INSTALL_ROOT=%{buildroot} @@ -200,6 +187,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -216,6 +204,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -257,12 +246,7 @@ export YAR_API_PORT=8964 %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -278,6 +262,9 @@ rm -rf %{buildroot} %changelog +* Sun Mar 6 2016 Remi Collet - 2.0.0-2 +- adapt for F24 + * Tue Oct 27 2015 Remi Collet - 2.0.0-1 - update to 2.0.0 (beta, php 7) @@ -345,3 +332,4 @@ rm -rf %{buildroot} * Wed Jul 17 2013 Remi Collet - 1.2.0-1 - initial package + -- cgit