diff options
| -rw-r--r-- | php-pecl-yaf-php7.spec | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/php-pecl-yaf-php7.spec b/php-pecl-yaf-php7.spec index ddd127e..66dcadf 100644 --- a/php-pecl-yaf-php7.spec +++ b/php-pecl-yaf-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-yaf} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global gh_commit 51e458e9746d7061efc565d49baaca26feacd7ff %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -35,7 +28,7 @@ Version: 3.0.2 Release: 0.8.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %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;')}} Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif License: PHP @@ -43,7 +36,6 @@ Group: Development/Languages URL: http://pecl.php.net/package/yaf Source1: %{pecl_name}.ini -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel @@ -52,10 +44,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} +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 @@ -95,7 +89,9 @@ mv %{pecl_name}-%{version} NTS %endif # Don't install/register tests -sed -e 's/role="test"/role="src"/' -i package.xml +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml cd NTS # Sanity check, really often broken @@ -127,7 +123,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} @@ -180,6 +175,7 @@ REPORT_EXIT_STATUS=1 \ %endif +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -196,14 +192,10 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi - - -%clean -rm -rf %{buildroot} +%endif %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -218,6 +210,9 @@ rm -rf %{buildroot} %changelog +* Sun Mar 6 2016 Remi Collet <remi@fedoraproject.org> - 3.0.2-2 +- adapt for F24 + * Mon Dec 28 2015 Remi Collet <remi@fedoraproject.org> - 3.0.2-1 - update to 3.0.2 (beta, php 7) |