From 2823dacabcfd0a688912d1d42d64c05dd0e89283 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Sep 2021 09:11:00 +0200 Subject: [PATCH 1/2] v1.8.0 (cherry picked from commit aac2a93a58d6fdc7729993a4e71cf7094dd3d1c5) --- .gitignore | 1 + php-league-mime-type-detection.spec | 19 ++++++++++--------- sources | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index de627da..c841e24 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-league-mime-type-detection-1.5.0-ea2fbfc.tgz /php-league-mime-type-detection-1.5.1-353f66d.tgz /php-league-mime-type-detection-1.7.0-3b9dff8.tgz +/php-league-mime-type-detection-1.8.0-b38b25d.tgz diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec index 6422a0b..dfa8970 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 3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3 +%global gh_commit b38b25d7b372e9fddb00335400467b223349fd7e %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.7.0 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Mime-type detection for Flysystem License: MIT @@ -38,13 +38,8 @@ BuildRequires: php-json # "phpunit/phpunit": "^8.5.8 || ^9.3", # "phpstan/phpstan": "^0.12.68", # "friendsofphp/php-cs-fixer": "^2.18" -%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 BuildRequires: phpunit9 >= 9.3 %global phpunit %{_bindir}/phpunit9 -%else -BuildRequires: phpunit8 >= 8.5.8 -%global phpunit %{_bindir}/phpunit8 -%endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -95,10 +90,13 @@ cat << 'EOF' | tee vendor/autoload.php require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php'; EOF +# We don't want PHPStan +sed -e 's/PHPStan\\Testing\\TestCase/PHPUnit\\Framework\\TestCase/' -i src/OverridingExtensionToMimeTypeMapTest.php + : Run upstream test suite # the_generated_map_should_be_up_to_date is online ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -119,6 +117,9 @@ exit $ret %changelog +* Mon Sep 27 2021 Remi Collet - 1.8.0-1 +- update to 1.8.0 + * Wed Jan 27 2021 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 14d559b..0eb45df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-mime-type-detection-1.7.0-3b9dff8.tgz) = 0fc96b17c531cd2558483e406ed5a4ca4f455668d8b101e2ac5388eb4949ea00e803c003584616e694a6c5f195987eb084d4628b53a9821d2ce7adff8e9fe2aa +SHA512 (php-league-mime-type-detection-1.8.0-b38b25d.tgz) = 8b7188829e1359c3de2a27ec62222ae1e3c9a699e605d1e34ceb1d73e41b592b2c6e2b8f8e19b1a74dac55cc7b2871d109875b6e0c87c18d7284dba1e9159361 From f02e9b8585255e5e315dbb4c8ef0eccbfa18330f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Nov 2021 08:08:39 +0100 Subject: [PATCH 2/2] v1.9.0 (cherry picked from commit 6e3b439a494f6b16b5ac6d694d171ea03c025587) --- .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 c841e24..d140a27 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-league-mime-type-detection-1.5.1-353f66d.tgz /php-league-mime-type-detection-1.7.0-3b9dff8.tgz /php-league-mime-type-detection-1.8.0-b38b25d.tgz +/php-league-mime-type-detection-1.9.0-aa70e81.tgz diff --git a/php-league-mime-type-detection.spec b/php-league-mime-type-detection.spec index dfa8970..6eb0ff8 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 b38b25d7b372e9fddb00335400467b223349fd7e +%global gh_commit aa70e813a6ad3d1558fc927863d47309b4c23e69 %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.8.0 +Version: 1.9.0 Release: 1%{?dist} Summary: Mime-type detection for Flysystem @@ -37,7 +37,7 @@ BuildRequires: php-json # From composer.json, "require-dev": { # "phpunit/phpunit": "^8.5.8 || ^9.3", # "phpstan/phpstan": "^0.12.68", -# "friendsofphp/php-cs-fixer": "^2.18" +# "friendsofphp/php-cs-fixer": "^3.2" BuildRequires: phpunit9 >= 9.3 %global phpunit %{_bindir}/phpunit9 # Autoloader @@ -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}" php73 php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -117,6 +117,9 @@ exit $ret %changelog +* Mon Nov 22 2021 Remi Collet - 1.9.0-1 +- update to 1.9.0 + * Mon Sep 27 2021 Remi Collet - 1.8.0-1 - update to 1.8.0 diff --git a/sources b/sources index 0eb45df..1cc78d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-mime-type-detection-1.8.0-b38b25d.tgz) = 8b7188829e1359c3de2a27ec62222ae1e3c9a699e605d1e34ceb1d73e41b592b2c6e2b8f8e19b1a74dac55cc7b2871d109875b6e0c87c18d7284dba1e9159361 +SHA512 (php-league-mime-type-detection-1.9.0-aa70e81.tgz) = 09e656b74a8378fdb6f3b37685bb4bfa5c6b65048a8716e2e83ada1bb6da20b8947605c03f4c90f984ac7a446e0e5b73ef9bdcd30b728f611d2fe39ccdedbb54