summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-07-01 08:15:52 +0200
committerRemi Collet <remi@php.net>2024-07-01 08:15:52 +0200
commite9587cc8e70e43f1c52a8e3a3d5755096ff34c23 (patch)
treed1091bf285ebd506935138d85a7bdbad94f87458
parentddd33b50fda21d83018c8803dcd6b36531122fd1 (diff)
update to 3.3.6
drop patch merged upstream
-rw-r--r--php-pecl-yaf.spec36
1 files changed, 6 insertions, 30 deletions
diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec
index b03a56f..2157fc0 100644
--- a/php-pecl-yaf.spec
+++ b/php-pecl-yaf.spec
@@ -28,22 +28,18 @@
Summary: Yet Another Framework
Name: %{?scl_prefix}php-pecl-yaf
-Version: 3.3.5
+Version: 3.3.6
%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}/%{sources}-%{gh_short}.tar.gz
%else
-Release: 4%{?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/%{sources}%{?prever}.tgz
%endif
License: PHP
URL: https://pecl.php.net/package/yaf
Source1: %{pecl_name}.ini
-Patch0: %{pecl_name}-php82.patch
-Patch1: %{pecl_name}-php83.patch
-Patch2: %{pecl_name}-php74.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -80,10 +76,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd %{sources}
-%patch -P0 -p1 -b .php82
-%patch -P1 -p1 -b .php83
-%patch -P2 -p1 -b .php74
-
# 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
@@ -173,26 +165,6 @@ REPORT_EXIT_STATUS=1 \
%endif
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%files
%{?_licensedir:%license %{sources}/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
@@ -208,6 +180,10 @@ fi
%changelog
+* Mon Jul 1 2024 Remi Collet <remi@remirepo.net> - 3.3.6-1
+- update to 3.3.6
+- drop patch merged upstream
+
* Mon Feb 19 2024 Remi Collet <remi@remirepo.net> - 3.3.5-4
- add patch for PHP 7.4 from
https://github.com/laruence/yaf/pull/579