diff options
Diffstat (limited to 'php-pecl-psr.spec')
| -rw-r--r-- | php-pecl-psr.spec | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/php-pecl-psr.spec b/php-pecl-psr.spec index 8b9c286..b0ec68c 100644 --- a/php-pecl-psr.spec +++ b/php-pecl-psr.spec @@ -25,11 +25,14 @@ Summary: PSR interfaces Name: %{?sub_prefix}php-pecl-psr Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz License: BSD URL: https://pecl.php.net/package/psr +Patch0: https://github.com/jbboehr/php-psr/commit/87855e941d39fc9ebcee3a84f0f73ce4103d236d.patch +Patch1: https://patch-diff.githubusercontent.com/raw/jbboehr/php-psr/pull/77.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear @@ -47,7 +50,7 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{relea Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff %if "%{php_version}" > "7.2" Obsoletes: php72u-pecl-%{pecl_name} <= %{version} @@ -61,6 +64,9 @@ Obsoletes: php73w-pecl-%{pecl_name} <= %{version} Obsoletes: php74-pecl-%{pecl_name} <= %{version} Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.0" +Obsoletes: php80-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -100,6 +106,9 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%patch0 -p1 -b .up +%patch1 -p1 -b .pr77 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_PSR_VERSION/{s/.* "//;s/".*$//;p}' php_psr.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -245,6 +254,10 @@ fi %changelog +* Mon Aug 24 2020 Remi Collet <remi@remirepo.net> - 1.0.0-3 +- add patches for PHP 8 from upstream and from + https://github.com/jbboehr/php-psr/pull/77 + * Wed Feb 19 2020 Remi Collet <remi@remirepo.net> - 1.0.0-1 - update to 1.0.0 (no change) |