From be9df4cabf230557fe602352f7928980049d120a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jan 2025 16:40:24 +0100 Subject: [PATCH] update to 1.8.5 re-license spec file to CECILL-2.1 (cherry picked from commit e4a8e5eb90c6f39c518d4193e83072bf8c2c71d5) --- php-myclabs-php-enum.spec | 20 ++++++++++++-------- sources | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index a302d46..3668688 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-myclabs-php-enum # -# Copyright (c) 2017-2022 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2017-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit a867478eae49c9f59ece437ae7f9506bfaa27483 +%global gh_commit e7be26966b7398204a234f8673fdad5ac6277802 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -21,8 +21,8 @@ %bcond_without tests Name: php-%{pk_vendor}-%{pk_project} -Version: 1.8.4 -Release: 5%{?dist} +Version: 1.8.5 +Release: 1%{?dist} Summary: PHP Enum implementation License: MIT @@ -41,7 +41,7 @@ BuildRequires: php-spl # From composer.json, "require-dev": { # "phpunit/phpunit": "^9.5", # "squizlabs/php_codesniffer": "1.*" -# "vimeo/psalm": "^4.6.2" +# "vimeo/psalm": "^4.6.2 || ^5.2" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.5 # Required by autoloader @@ -103,7 +103,7 @@ require __DIR__ . '/bootstrap.php'; EOF ret=0 -for cmd in "php %{phpunit}" php74 php80 php81 php82; do +for cmd in "php %{phpunit}" php81 php82 php83 php84; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit9} --verbose --bootstrap tests/autoload.php || ret=1 @@ -124,6 +124,10 @@ exit $ret %changelog +* Tue Jan 14 2025 Remi Collet - 1.8.5-1 +- update to 1.8.5 +- re-license spec file to CECILL-2.1 + * Thu Jan 25 2024 Fedora Release Engineering - 1.8.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 1751564..9550475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.8.4-a867478.tgz) = 346b79cc80e4ef7446c08f7329000d72ab3a75101ff4d2575e9721b7ed7bf9ce6000d114292ebaca81d3b8631ecc28b00f5bc821cf4d7f79368c58f384bd38f3 +SHA512 (php-myclabs-php-enum-1.8.5-e7be269.tgz) = 40002568d2ae96f62c6157a1f76f6e7c8f55dd0ca1e73554958533d9a178a05ff53a847a712f72d3cfa295cc49c452df9f1f71ad14c79f0e1b4a1b86df6b596f