From 9cfc49a40233f0e2d3d21cc04410bb5fe13a72ff Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 16 Dec 2021 08:45:28 +0100
Subject: update to 3.3.4

drop patch merged upstream
---
 php-pecl-yaf.spec | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'php-pecl-yaf.spec')

diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec
index 73adad2..9ae4bc9 100644
--- a/php-pecl-yaf.spec
+++ b/php-pecl-yaf.spec
@@ -11,7 +11,6 @@
 %undefine _strict_symbol_defs_build
 
 %if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
 %scl_package       php-pecl-yaf
 %endif
 
@@ -25,21 +24,19 @@
 %global ini_name    40-%{pecl_name}.ini
 
 Summary:       Yet Another Framework
-Name:          %{?sub_prefix}php-pecl-yaf
-Version:       3.3.3
+Name:          %{?scl_prefix}php-pecl-yaf
+Version:       3.3.4
 %if 0%{?gh_date:1}
 Release:       0.13.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 %else
-Release:       3%{?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;')}}
 Source:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 %endif
 License:       PHP
 URL:           https://pecl.php.net/package/yaf
 Source1:       %{pecl_name}.ini
 
-Patch0:        %{pecl_name}-php81.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -56,10 +53,6 @@ Provides:      %{?scl_prefix}php-%{pecl_name}               = %{version}
 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 "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-%endif
 
 %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
@@ -100,8 +93,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .pr548
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h )
 if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
@@ -167,9 +158,8 @@ cd NTS
 : Upstream test suite  for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="$OPTS -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{__php} -n run-tests.php --show-diff
+%{__php} -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 cd ../ZTS
@@ -182,9 +172,8 @@ cd ../ZTS
 : Upstream test suite  for NTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
 TEST_PHP_ARGS="$OPTS -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php --show-diff
+%{__ztsphp} -n run-tests.php -q --show-diff
 %endif
 
 
@@ -223,6 +212,10 @@ fi
 
 
 %changelog
+* Thu Dec 16 2021 Remi Collet <remi@remirepo.net> - 3.3.4-1
+- update to 3.3.4
+- drop patch merged upstream
+
 * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 3.3.3-3
 - rebuild for 8.1.0RC1
 
-- 
cgit