From 3976d4e9de72a56b1109e91136d1bc9fb0e82440 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Aug 2023 07:30:55 +0200 Subject: [PATCH 1/3] update to 1.13.0 raise dependency on PHP 7.4 use phpunit10 (cherry picked from commit bb75fb4908e962ea09ded3b5af298892dad7faab) --- .gitignore | 1 + php-league-mime-type-detection.spec | 33 +++++++++++++++++------------ sources | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index d0c0ef4..69009a4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-league-mime-type-detection-1.9.0-aa70e81.tgz /php-league-mime-type-detection-1.10.0-3e4a35d.tgz /php-league-mime-type-detection-1.11.0-ff6248e.tgz +/php-league-mime-type-detection-1.13.0-a6dfb11.tgz diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec index 063c539..db42f12 100644 --- a/php-league-mime-type-detection.spec +++ b/php-league-mime-type-detection.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-league-mime-type-detection # -# Copyright (c) 2020-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2020-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit ff6248ea87a9f116e78edd6002e39e5128a0d4dd +%global gh_commit a6dfb1194a2946fcdc1f38219445234f65b35c96 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner thephpleague %global gh_project mime-type-detection @@ -19,8 +19,8 @@ %global ns_project MimeTypeDetection Name: php-%{pk_vendor}-%{pk_name} -Version: 1.11.0 -Release: 3%{?dist} +Version: 1.13.0 +Release: 1%{?dist} Summary: Mime-type detection for Flysystem License: MIT @@ -31,22 +31,22 @@ Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.4 BuildRequires: php-fileinfo BuildRequires: php-json # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5.8 || ^9.3", +# "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0", # "phpstan/phpstan": "^0.12.68", # "friendsofphp/php-cs-fixer": "^3.2" -BuildRequires: phpunit9 >= 9.3 -%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit10 +%global phpunit %{_bindir}/phpunit10 # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^7.2 || ^8.0", +# "php": "^7.4 || ^8.0", # "ext-fileinfo": "*" -Requires: php(language) >= 7.2 +Requires: php(language) >= 7.4 Requires: php-fileinfo # From phpcompatifo report for 1.4.0 Requires: php-json @@ -96,13 +96,13 @@ sed -e 's/PHPStan\\Testing\\TestCase/PHPUnit\\Framework\\TestCase/' -i src/Overr : Run upstream test suite # the_generated_map_should_be_up_to_date is online ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" "php80 %{_bindir}/phpunit9" php81 php82 php83; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit9} \ + $1 ${2:-%{_bindir}/phpunit10} \ --filter '^((?!(the_generated_map_should_be_up_to_date)).)*$' \ --no-coverage \ - --verbose || ret=1 + || ret=1 fi done exit $ret @@ -117,6 +117,11 @@ exit $ret %changelog +* Fri Aug 25 2023 Remi Collet - 1.13.0-1 +- update to 1.13.0 +- raise dependency on PHP 7.4 +- use phpunit10 + * Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 6ad0b4b..61a5954 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-mime-type-detection-1.11.0-ff6248e.tgz) = 5d71fb3c6ca91576cf8527f5bc454a73c23eddffe1c15b6ff7e551337957fce18d8900e2c724af6d2b9f60e6c093573c7521bc9d516f8dcde841dbdaa5e02ae2 +SHA512 (php-league-mime-type-detection-1.13.0-a6dfb11.tgz) = c9d8ba81d9e3476db2866cff4968993eea09db1b43fbff7c6e4ec75020402e79097b5f14be02c7eb7493b1b5c1ec6efb539ee143a0baaa9656c8bf071711d690 From 0fceeda6ffe3df86930924f9a8cdcb5214da2ba2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Oct 2023 08:01:15 +0200 Subject: [PATCH 2/3] v1.14.0 (cherry picked from commit 2fd2b4404261d5e8ce8bf32b97d11314139c35ab) --- .gitignore | 1 + php-league-mime-type-detection.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 69009a4..e86dfc9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-league-mime-type-detection-1.10.0-3e4a35d.tgz /php-league-mime-type-detection-1.11.0-ff6248e.tgz /php-league-mime-type-detection-1.13.0-a6dfb11.tgz +/php-league-mime-type-detection-1.14.0-b6a5854.tgz diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec index db42f12..be5db1c 100644 --- a/php-league-mime-type-detection.spec +++ b/php-league-mime-type-detection.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit a6dfb1194a2946fcdc1f38219445234f65b35c96 +%global gh_commit b6a5854368533df0295c5761a0253656a2e52d9e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner thephpleague %global gh_project mime-type-detection @@ -19,7 +19,7 @@ %global ns_project MimeTypeDetection Name: php-%{pk_vendor}-%{pk_name} -Version: 1.13.0 +Version: 1.14.0 Release: 1%{?dist} Summary: Mime-type detection for Flysystem @@ -117,6 +117,9 @@ exit $ret %changelog +* Wed Oct 18 2023 Remi Collet - 1.14.0-1 +- update to 1.14.0 + * Fri Aug 25 2023 Remi Collet - 1.13.0-1 - update to 1.13.0 - raise dependency on PHP 7.4 diff --git a/sources b/sources index 61a5954..24393b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-mime-type-detection-1.13.0-a6dfb11.tgz) = c9d8ba81d9e3476db2866cff4968993eea09db1b43fbff7c6e4ec75020402e79097b5f14be02c7eb7493b1b5c1ec6efb539ee143a0baaa9656c8bf071711d690 +SHA512 (php-league-mime-type-detection-1.14.0-b6a5854.tgz) = 860dac8ef650fbbb0b49ec1729adb442676bf4dfaf0b879d9bb08e773a5321dfba9ea2f62026b37ef4757a204ab4965bf28d4f3d4969f2603276e5b9d480dd9a From d01997f69ee1ab3c6612ecf79205cbf80d797c59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Jan 2024 09:36:31 +0100 Subject: [PATCH 3/3] v1.15.0 (cherry picked from commit eff0994838ded860c98f79bd925428a50cd4a3e0) (cherry picked from commit fe12f3fa2b7ebd1efb2a461ccdecb4d9087a968e) --- .gitignore | 1 + php-league-mime-type-detection.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e86dfc9..2915b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /php-league-mime-type-detection-1.11.0-ff6248e.tgz /php-league-mime-type-detection-1.13.0-a6dfb11.tgz /php-league-mime-type-detection-1.14.0-b6a5854.tgz +/php-league-mime-type-detection-1.15.0-ce0f4d1.tgz diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec index be5db1c..4103782 100644 --- a/php-league-mime-type-detection.spec +++ b/php-league-mime-type-detection.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-league-mime-type-detection # -# Copyright (c) 2020-2023 Remi Collet +# Copyright (c) 2020-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit b6a5854368533df0295c5761a0253656a2e52d9e +%global gh_commit ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner thephpleague %global gh_project mime-type-detection @@ -19,7 +19,7 @@ %global ns_project MimeTypeDetection Name: php-%{pk_vendor}-%{pk_name} -Version: 1.14.0 +Version: 1.15.0 Release: 1%{?dist} Summary: Mime-type detection for Flysystem @@ -96,7 +96,7 @@ sed -e 's/PHPStan\\Testing\\TestCase/PHPUnit\\Framework\\TestCase/' -i src/Overr : Run upstream test suite # the_generated_map_should_be_up_to_date is online ret=0 -for cmdarg in "php %{phpunit}" "php80 %{_bindir}/phpunit9" php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit10} \ @@ -117,6 +117,9 @@ exit $ret %changelog +* Mon Jan 29 2024 Remi Collet - 1.15.0-1 +- update to 1.15.0 + * Wed Oct 18 2023 Remi Collet - 1.14.0-1 - update to 1.14.0 diff --git a/sources b/sources index 24393b3..047246f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-mime-type-detection-1.14.0-b6a5854.tgz) = 860dac8ef650fbbb0b49ec1729adb442676bf4dfaf0b879d9bb08e773a5321dfba9ea2f62026b37ef4757a204ab4965bf28d4f3d4969f2603276e5b9d480dd9a +SHA512 (php-league-mime-type-detection-1.15.0-ce0f4d1.tgz) = 664dacb63a471a93f635d83f0e69d9fbe153884a3405a6baf34a0299c3587adedeaec8394169e9557483a3abc627ccb7c11e5769ce2f99413cf6701c5419e6be