From 35c24923242603723ad99809fceb775523e97cc2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Sep 2020 07:19:54 +0200 Subject: update to 1.0.9 drop patch merged upstream --- php-ast.spec | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'php-ast.spec') diff --git a/php-ast.spec b/php-ast.spec index 492c092..c82bda4 100644 --- a/php-ast.spec +++ b/php-ast.spec @@ -20,11 +20,11 @@ Summary: Abstract Syntax Tree Name: %{?scl_prefix}php-ast -Version: 1.0.8 +Version: 1.0.9 %if 0%{?gh_date:1} Release: 0.6.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} @@ -34,8 +34,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif -Patch0: https://patch-diff.githubusercontent.com/raw/nikic/php-ast/pull/174.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear @@ -58,22 +56,16 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} %if "%{php_version}" > "7.2" -Obsoletes: php72u-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73-%{pecl_name} <= %{version} Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" -Obsoletes: php74-%{pecl_name} <= %{version} Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "8.0" +Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif %endif @@ -105,8 +97,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr174 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_AST_VERSION/{s/.* "//;s/".*$//;p}' php_ast.h) if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then @@ -235,6 +225,10 @@ fi %changelog +* Fri Sep 4 2020 Remi Collet - 1.0.9-1 +- update to 1.0.9 +- drop patch merged upstream + * Wed Sep 2 2020 Remi Collet - 1.0.8-2 - add patch for 8.0.0beta3 from https://github.com/nikic/php-ast/pull/174 -- cgit