re-license spec file to CECILL-2.1HEADmaster

1 files changed, 14 insertions, 33 deletions

diff --git a/php-pecl-skywalking.spec b/php-pecl-skywalking.spec
index 7180c77..3b4b45a 100644
--- a/php-pecl-skywalking.spec
+++ b/php-pecl-skywalking.spec
@@ -1,8 +1,8 @@
 # remirepo spec file for php-pecl-skywalking
 #
-# Copyright (c) 2019-2022 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2019-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -22,7 +22,7 @@
 Summary:        The PHP instrument agent for Apache SkyWalking
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        5.0.1
-Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        Apache-2.0
 URL:            https://pecl.php.net/package/%{pecl_name}
 
@@ -31,12 +31,8 @@ Source0:        https://pecl.php.net/get/%{sources}.tgz
 Source1:        makedeps.sh
 Source2:        https://pecl.php.net/get/%{pecl_name}-deps-%{version}.tgz
 
-%if 0%{?rhel} == 7 && 0%{?dtsversion} == 0
-BuildRequires:  devtoolset-6-toolchain
-%global dtsversion 6
-%global dtsenable source /opt/rh/devtoolset-6/enable
-%global dtsprefix devtoolset-6-
-%endif
+Patch0:         %{pecl_name}-php85.patch
+
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7.0
@@ -96,14 +92,17 @@ 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
 
 pushd %{sources}
+%patch -P0 -p1
+
 # Create cargo configuration to use vendor directory
 mkdir .cargo
 cat << EOF | tee .cargo/config.toml
 [build]
+jobs = %(echo %{?_smp_mflags} | sed 's/\-j//')
 rustc = "%{_root_bindir}/rustc"
 
 [env]
@@ -213,27 +212,6 @@ cd %{sources}
 for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
-%{!?_licensedir:install -Dpm 644 LICENSE %{buildroot}%{pecl_docdir}/%{pecl_name}/LICENSE}
-
-
-%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
 
 
 %check
@@ -253,7 +231,7 @@ OPT="-n -d extension=curl.so -d extension=json.so"
 
 
 %files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -267,6 +245,9 @@ OPT="-n -d extension=curl.so -d extension=json.so"
 
 
 %changelog
+* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 5.0.1-4
+- re-license spec file to CECILL-2.1
+
 * Mon Sep  4 2023 Remi Collet <remi@remirepo.net> - 5.0.1-3
 - build out of sources tree