add patch for PHP 8.5.0alpha3 fromHEADmaster

  https://github.com/php/pecl-processing-rrd/pull/4
re-license spec file to CECILL-2.1

2 files changed, 75 insertions, 26 deletions

diff --git a/php-pecl-rrd.spec b/php-pecl-rrd.spec
index 6a19d82..fbad2f1 100644
--- a/php-pecl-rrd.spec
+++ b/php-pecl-rrd.spec
@@ -3,9 +3,9 @@
 #
 # Fedora spec file for php-pecl-rrd
 #
-# Copyright (c) 2011-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2011-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -24,13 +24,14 @@
 Summary:      PHP Bindings for rrdtool
 Name:         %{?scl_prefix}php-pecl-rrd
 Version:      2.0.3
-Release:      12%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:      13%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:      BSD-2-Clause
 URL:          https://pecl.php.net/package/rrd
 
 Source:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
 Patch0:       %{pecl_name}-build.patch
+Patch1:       %{pecl_name}-php85.patch
 
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
@@ -66,11 +67,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
 cd %{sources}
 %patch -P0 -p1
+%patch -P1 -p1
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_RRD_VERSION/{s/.* "//;s/".*$//;p}' php_rrd.h)
@@ -170,29 +172,9 @@ NO_INTERACTION=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
 %doc %{pecl_docdir}/%{pecl_name}
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
 %{pecl_xmldir}/%{name}.xml
 
 %config(noreplace) %{php_inidir}/%{ini_name}
@@ -205,6 +187,11 @@ fi
 
 
 %changelog
+* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 2.0.3-13
+- add patch for PHP 8.5.0alpha3 from
+  https://github.com/php/pecl-processing-rrd/pull/4
+- re-license spec file to CECILL-2.1
+
 * Mon Jan 29 2024 Remi Collet <remi@remirepo.net> - 2.0.3-12
 - fix incompatible pointer types using patch from
   https://github.com/php/pecl-processing-rrd/pull/4
diff --git a/rrd-php85.patch b/rrd-php85.patch
new file mode 100644
index 0000000..da89759
--- /dev/null
+++ b/rrd-php85.patch
@@ -0,0 +1,62 @@
+From dd4856dc89499a0141b1710e791f0e1096c7b244 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 30 Jul 2025 13:39:24 +0200
+Subject: [PATCH] use Zend/zend_smart_string.h
+
+---
+ rrd.c        | 4 ++++
+ rrd_graph.c  | 4 ++++
+ rrd_update.c | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/rrd.c b/rrd.c
+index ab19b41..ff51776 100644
+--- a/rrd.c
++++ b/rrd.c
+@@ -12,7 +12,11 @@
+ #endif
+ 
+ #include "php.h"
++#if PHP_VERSION_ID < 70200
+ #include "ext/standard/php_smart_string.h"
++#else
++#include "Zend/zend_smart_string.h"
++#endif
+ #include "ext/standard/php_array.h"
+ #include "ext/standard/info.h"
+ 
+diff --git a/rrd_graph.c b/rrd_graph.c
+index 96a47f4..0e43550 100644
+--- a/rrd_graph.c
++++ b/rrd_graph.c
+@@ -14,7 +14,11 @@
+ 
+ #include "php.h"
+ #include "zend_exceptions.h"
++#if PHP_VERSION_ID < 70200
+ #include "ext/standard/php_smart_string.h"
++#else
++#include "Zend/zend_smart_string.h"
++#endif
+ 
+ #include <rrd.h>
+ 
+diff --git a/rrd_update.c b/rrd_update.c
+index 1fc4573..e21c778 100644
+--- a/rrd_update.c
++++ b/rrd_update.c
+@@ -14,7 +14,11 @@
+ 
+ #include "php.h"
+ #include "zend_exceptions.h"
++#if PHP_VERSION_ID < 70200
+ #include "ext/standard/php_smart_string.h"
++#else
++#include "Zend/zend_smart_string.h"
++#endif
+ 
+ #include <rrd.h>
+ 
+-- 
+2.50.1
+