diff options
| author | Remi Collet <remi@remirepo.net> | 2025-03-04 10:49:43 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-03-04 10:49:43 +0100 |
| commit | 1892fed7a1c45cf67f5070f0d989648887db5ce9 (patch) | |
| tree | 2cc6c01d1d17dbed7440631774a9889be6ab4305 | |
| parent | 76c97c29fef505755e59b2c4cc9f4fcb6231e7b2 (diff) | |
re-license spec file to CECILL-2.1
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-psr-http-factory.spec | 36 |
2 files changed, 18 insertions, 25 deletions
diff --git a/composer.json b/composer.json index d1bbdde..82a1d32 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "psr/http-factory", - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "psr", "psr-7", @@ -18,8 +18,11 @@ "homepage": "https://www.php-fig.org/" } ], + "support": { + "source": "https://github.com/php-fig/http-factory" + }, "require": { - "php": ">=7.0.0", + "php": ">=7.1", "psr/http-message": "^1.0 || ^2.0" }, "autoload": { diff --git a/php-psr-http-factory.spec b/php-psr-http-factory.spec index 4106e59..66fdad1 100644 --- a/php-psr-http-factory.spec +++ b/php-psr-http-factory.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-psr-http-factory # -# Copyright (c) 2018-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2018-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 e616d01114759c4c489f93b099585439f795fe35 +%global gh_commit 2b4765fddfe3b508ac62f829e852b1501d3f6e8a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner php-fig %global gh_project http-factory @@ -16,38 +16,26 @@ %global pk_project %{gh_project} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.0.2 +Version: 1.1.0 Release: 1%{?dist} Summary: Common interfaces for PSR-7 HTTP message factories License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{url}/archive/%{gh_commit}/%{name}-%{version}-%{gh_commit}.tar.gz +Source0: %{url}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz BuildArch: noarch # For tests -BuildRequires: php(language) >= 7 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: php(language) >= 7.1 BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 3) -# remirepo:3 -%else -BuildRequires: php-psr-http-message -%endif BuildRequires: php-cli BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.0.0", +# "php": ">=7.1", # "psr/http-message": "^1.0 || ^2.0" -Requires: php(language) >= 7 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: php(language) >= 7.1 Requires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 3) -# remirepo:3 -%else -Requires: php-psr-http-message -%endif # phpcompatinfo (computed from version 1.0.0) # <none> # Autoloader @@ -100,8 +88,6 @@ exit (interface_exists("Psr\\Http\\Message\\RequestFactoryInterface") ? 0 : 1); %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json @@ -109,6 +95,10 @@ exit (interface_exists("Psr\\Http\\Message\\RequestFactoryInterface") ? 0 : 1); %changelog +* Tue Mar 4 2025 Remi Collet <remi@remirepo.net> - 1.1.0-1 +- update to 1.1.0 +- re-license spec file to CECILL-2.1 + * Tue Apr 11 2023 Remi Collet <remi@remirepo.net> - 1.0.2-1 - update to 1.0.2 - allow psr/http-message 2.0 |