diff options
| author | Remi Collet <remi@remirepo.net> | 2018-07-04 12:24:21 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-07-04 12:24:21 +0200 |
| commit | 2befa842cd07b38716efee28b8041a24154aa42e (patch) | |
| tree | 49b87d98e4444081dd81e1e5f0a19a86e9b10fba /php-pecl-yaml.spec | |
| parent | e135fbbc964385fd3787bf3b6201deae050f297a (diff) | |
add better patch for PHP 7.3 from https://github.com/php/pecl-file_formats-yaml/pull/33
Diffstat (limited to 'php-pecl-yaml.spec')
| -rw-r--r-- | php-pecl-yaml.spec | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec index 9fe7e6e..4a9b2dd 100644 --- a/php-pecl-yaml.spec +++ b/php-pecl-yaml.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-yaml # -# Copyright (c) 2012-2017 Remi Collet +# Copyright (c) 2012-2018 Remi Collet # Fedora spec file for php-pecl-yaml # @@ -22,13 +22,15 @@ Summary: PHP Bindings for yaml Name: %{?sub_prefix}php-pecl-yaml Version: 2.0.2 -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;')}} License: MIT -Group: Development/Languages URL: http://pecl.php.net/package/yaml Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/php/pecl-file_formats-yaml/pull/33.patch + +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: libyaml-devel @@ -48,12 +50,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} @@ -66,6 +62,10 @@ Obsoletes: php71w-pecl-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -94,6 +94,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr33 # Check upstream version (often broken) extver=$(sed -n '/#define PHP_YAML_VERSION/{s/.* "//;s/".*$//;p}' php_yaml.h) @@ -207,7 +208,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -242,6 +243,15 @@ fi %changelog +* Wed Jul 4 2018 Remi Collet <remi@remirepo.net> - 2.0.2-3 +- add better patch for PHP 7.3 from + https://github.com/php/pecl-file_formats-yaml/pull/33 + +* Tue Jul 3 2018 Remi Collet <remi@remirepo.net> - 2.0.2-2 +- add patch for PHP 7.3 from + https://github.com/php/pecl-file_formats-yaml/pull/32 +- ignore 1 failed test with PHP 7.3 + * Tue Aug 1 2017 Remi Collet <remi@remirepo.net> - 2.0.2-1 - Update to 2.0.2 |