diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-06 08:57:26 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-06 08:57:26 +0100 |
| commit | 26761f37d4ead19c024926e83e49dd3388d9fb88 (patch) | |
| tree | 6688ae98770af795dc93a36d4c200e28a6953691 | |
| parent | eb3e2aa3b2e0f960750065b3305aa3ad9939e629 (diff) | |
php-pecl-yaml: F24
| -rw-r--r-- | php-pecl-yaml-php7.spec | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/php-pecl-yaml-php7.spec b/php-pecl-yaml-php7.spec index 2d784dd..fb13f15 100644 --- a/php-pecl-yaml-php7.spec +++ b/php-pecl-yaml-php7.spec @@ -18,9 +18,6 @@ %endif %{?scl: %scl_package php-pecl-yaml} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name yaml @@ -30,14 +27,13 @@ Summary: PHP Bindings for yaml Name: %{?sub_prefix}php-pecl-yaml Version: 2.0.0 -Release: 0.7.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.8.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT Group: Development/Languages URL: http://pecl.php.net/package/yaml Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: libyaml-devel @@ -46,10 +42,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 @@ -86,7 +84,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pecl_name}-%{version}%{?prever} NTS # Remove test file to avoid regsitration -sed -e '/role="test"/d' -i package.xml +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml cd NTS # Check upstream version (often broken) @@ -201,10 +201,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%clean -rm -rf %{buildroot} - - +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -221,10 +218,10 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %files -%defattr(-, root, root, -) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -239,6 +236,9 @@ fi %changelog +* Sun Mar 6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.8.RC7 +- adapt for F24 + * Tue Mar 1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.7.RC7 - skip yaml_002.phpt, see https://bugs.php.net/71696 @@ -320,3 +320,4 @@ fi * Thu May 05 2011 Thomas Morse <tmorse@empowercampaigns.com> 1.0.1-1 - Version 1.0.1 - initial RPM + |