diff options
| author | Remi Collet <remi@remirepo.net> | 2024-07-09 15:27:02 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-07-09 15:27:02 +0200 |
| commit | 629eeb047ceeb36066298f25dc496eb7bc481b18 (patch) | |
| tree | b570a0920bd4aa7db0fac39bc6083cec5d5c0735 /php-pecl-oauth.spec | |
| parent | a32d1029fad72fd1d83f570dcf5d4dd89255d8bc (diff) | |
add patch for PHP 8.4 from
https://github.com/php/pecl-web_services-oauth/pull/30
Diffstat (limited to 'php-pecl-oauth.spec')
| -rw-r--r-- | php-pecl-oauth.spec | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index 9462e2c..8eeef4a 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -21,7 +21,7 @@ Name: %{?scl_prefix}php-pecl-oauth Version: 2.0.7 -Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP OAuth consumer extension License: BSD-3-Clause URL: https://pecl.php.net/package/oauth @@ -29,6 +29,7 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: %{pecl_name}-pcre.patch Patch1: %{pecl_name}-php82.patch +Patch2: %{pecl_name}-php84.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -46,17 +47,6 @@ 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} -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7 -# Other third party repo stuff -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -%endif -%endif - %description OAuth is an authorization protocol built on top of HTTP which allows @@ -73,12 +63,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO # Don't install/register tests sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml cd %{sources} %patch -P0 -p1 -b .up %patch -P1 -p1 -b .pr24 +%patch -P2 -p1 -b .pr30 #sed -e '/PHP_OAUTH_VERSION/s/2.0.3-dev/2.0.3/' -i php_oauth.h # Sanity check, really often broken @@ -140,26 +131,6 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check cd %{sources} @@ -186,7 +157,7 @@ REPORT_EXIT_STATUS=1 \ %files -%{?_licensedir:%license %{sources}/LICENSE} +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -200,6 +171,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Jul 9 2024 Remi Collet <remi@remirepo.net> - 2.0.7-10 +- add patch for PHP 8.4 from + https://github.com/php/pecl-web_services-oauth/pull/30 + * Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 2.0.7-9 - rebuild for PHP 8.3.0RC1 |