From 708c05f2dd36f89d5c628e4b4ba2c53958f7b85d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jan 2025 15:20:56 +0100 Subject: update to 1.8.5 re-license spec file to CECILL-2.1 --- composer.json | 4 ++-- php-myclabs-php-enum.spec | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 978cb19..eab6263 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "library", "description": "PHP Enum implementation", "keywords": ["enum"], - "homepage": "http://github.com/myclabs/php-enum", + "homepage": "https://github.com/myclabs/php-enum", "license": "MIT", "authors": [ { @@ -31,6 +31,6 @@ "require-dev": { "phpunit/phpunit": "^9.5", "squizlabs/php_codesniffer": "1.*", - "vimeo/psalm": "^4.6.2" + "vimeo/psalm": "^4.6.2 || ^5.2" } } diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index eda4add..dfa2399 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,7 +21,7 @@ %bcond_without tests Name: php-%{pk_vendor}-%{pk_project} -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Summary: PHP Enum implementation @@ -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 @@ -126,6 +126,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 Aug 4 2022 Remi Collet - 1.8.4-1 - update to 1.8.4 -- cgit