summaryrefslogtreecommitdiffstats
path: root/php-pecl-yaml.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-07-22 11:44:56 +0200
committerRemi Collet <remi@remirepo.net>2020-07-22 11:44:56 +0200
commit04694e2f888d7666c78b86d982eee741e92ccb0c (patch)
tree23bd75216a3f389544a4b4db0103512126936fb5 /php-pecl-yaml.spec
parent76041d5500368be3096a4821310d0523dfaa98ae (diff)
rebuild for 8.0.0alpha3 using patch from
https://github.com/php/pecl-file_formats-yaml/pull/53
Diffstat (limited to 'php-pecl-yaml.spec')
-rw-r--r--php-pecl-yaml.spec13
1 files changed, 11 insertions, 2 deletions
diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec
index 2bd4e75..0bcda8e 100644
--- a/php-pecl-yaml.spec
+++ b/php-pecl-yaml.spec
@@ -22,13 +22,14 @@
Summary: PHP Bindings for yaml
Name: %{?sub_prefix}php-pecl-yaml
Version: 2.1.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;')}}
License: MIT
URL: https://pecl.php.net/package/yaml
Source: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
Patch0: https://patch-diff.githubusercontent.com/raw/php/pecl-file_formats-yaml/pull/45.patch
+Patch1: https://patch-diff.githubusercontent.com/raw/php/pecl-file_formats-yaml/pull/53.patch
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.1
@@ -48,7 +49,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
Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
@@ -68,6 +69,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: php74-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -97,6 +101,7 @@ sed -e 's/role="test"/role="src"/' \
cd NTS
%patch0 -p1 -b .pr45
+%patch1 -p1 -b .pr52
# Check upstream version (often broken)
extver=$(sed -n '/#define PHP_YAML_VERSION/{s/.* "//;s/".*$//;p}' php_yaml.h)
@@ -245,6 +250,10 @@ fi
%changelog
+* Wed Jul 22 2020 Remi Collet <remi@remirepo.net> - 2.1.0-2
+- rebuild for 8.0.0alpha3 using patch from
+ https://github.com/php/pecl-file_formats-yaml/pull/53
+
* Thu Apr 23 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
- update to 2.1.0
- raise dependency on PHP 7.1