diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-06 07:17:28 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-06 07:17:28 +0100 |
| commit | 84746f6f309b70101839659674f65f1f610cd4ad (patch) | |
| tree | 0f97adce9a5bee03b0891f4585a358795434c8be | |
| parent | 2e13478363b906394fe5ecca9915eb5d94ed0010 (diff) | |
php-pecl-oauth: F24
| -rw-r--r-- | php-pecl-oauth-php7.spec | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/php-pecl-oauth-php7.spec b/php-pecl-oauth-php7.spec index 2a88035..11e785e 100644 --- a/php-pecl-oauth-php7.spec +++ b/php-pecl-oauth-php7.spec @@ -17,7 +17,7 @@ Name: %{?scl_prefix}php-pecl-oauth Version: 2.0.0 -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;')}} Summary: PHP OAuth consumer extension Group: Development/Languages License: BSD @@ -33,10 +33,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 @@ -73,7 +75,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pecl_name}-%{version} NTS # 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 # Sanity check, really often broken extver=$(sed -n '/#define PHP_OAUTH_VERSION/{s/.* //;s/".*$//;p}' NTS/php_oauth.h) @@ -128,6 +132,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 @@ -144,6 +149,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -175,6 +181,9 @@ fi %changelog +* Sun Mar 6 2016 Remi Collet <rcollet@redhat.com> - 2.0.0-2 +- adapt for F24 + * Sun Jan 3 2016 Remi Collet <rcollet@redhat.com> - 2.0.0-1 - update to 2.0.0 (php 7, stable) |