diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-17 16:00:46 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-17 16:00:46 +0200 |
| commit | 022aa95c2e89c64d1e80d29b49e83b8c7ab9908d (patch) | |
| tree | 483b6e906bdf9d4fd7a388eee1d6b3c2ef1a1a94 | |
| parent | 59cc19e304d83e420b5a551b995c3fe588c16f2d (diff) | |
add fix for PHP 8.5.0alpha2 using patch from
https://github.com/laruence/yar/pull/181
re-license spec file to CECILL-2.1
| -rw-r--r-- | php-pecl-yar.spec | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/php-pecl-yar.spec b/php-pecl-yar.spec index 9e32e1f..6afc143 100644 --- a/php-pecl-yar.spec +++ b/php-pecl-yar.spec @@ -1,14 +1,12 @@ # remirepo spec file for php-pecl-yar # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%scl_package php-pecl-yar -%endif +%{?scl:%scl_package php-pecl-yar} %bcond_without tests @@ -29,12 +27,14 @@ Version: 2.3.3 Release: 0.14.%{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: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} +Patch0: 181.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: curl-devel @@ -73,10 +73,12 @@ mv %{pecl_name}-%{version} NTS # 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 NTS +%patch -P0 -p1 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}%{?gh_date:-dev}"; then @@ -198,7 +200,7 @@ export YAR_API_PORT=$(%{__php} -r 'echo 8960 + PHP_MAJOR_VERSION*100 + PHP_MINOR %files -%{?_licensedir:%license NTS/LICENSE} +%license NTS/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -214,6 +216,11 @@ export YAR_API_PORT=$(%{__php} -r 'echo 8960 + PHP_MAJOR_VERSION*100 + PHP_MINOR %changelog +* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 2.3.3-2 +- add fix for PHP 8.5.0alpha2 using patch from + https://github.com/laruence/yar/pull/181 +- re-license spec file to CECILL-2.1 + * Mon Jul 1 2024 Remi Collet <remi@remirepo.net> - 2.3.3-1 - update to 2.3.3 - drop patch merged upstream |