diff --git a/.gitignore b/.gitignore index 14ba578..62e93d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-phpdocumentor-reflection-docblock5-5.1.0-cd72d39.tar.gz /php-phpdocumentor-reflection-docblock5-5.2.0-3170448.tar.gz /php-phpdocumentor-reflection-docblock5-5.2.1-d870572.tar.gz +/php-phpdocumentor-reflection-docblock5-5.2.2-069a785.tar.gz diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 061386a..6864105 100644 --- a/php-phpdocumentor-reflection-docblock5.spec +++ b/php-phpdocumentor-reflection-docblock5.spec @@ -8,7 +8,7 @@ # # Please, preserve the changelog entries # -%global gh_commit d870572532cd70bc3fab58f2e23ad423c8404c44 +%global gh_commit 069a785b2141f5bcf49f3e353548dc1cce6df556 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpDocumentor %global gh_project ReflectionDocBlock @@ -16,7 +16,7 @@ %bcond_without tests Name: php-phpdocumentor-reflection-docblock%{major} -Version: 5.2.1 +Version: 5.2.2 Release: 1%{?dist} Summary: DocBlock parser @@ -38,9 +38,14 @@ BuildRequires: (php-composer(webmozart/assert) >= 1.9.1 with php- BuildRequires: (php-composer(phpdocumentor/reflection-common) >= 2.2 with php-composer(phpdocumentor/reflection-common) < 3) # From composer.json, require-dev # "mockery/mockery": "~1.3.2" -BuildRequires: (php-composer(mockery/mockery) >= 1.3.2 with php-composer(mockery/mockery) < 2) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 9 BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 +%endif +BuildRequires: (php-composer(mockery/mockery) >= 1.3.2 with php-composer(mockery/mockery) < 2) # From phpcompatinfo report for 5.0.0 BuildRequires: php-reflection BuildRequires: php-pcre @@ -85,7 +90,8 @@ sed 's#vendor/mockery/mockery/library/Mockery#%{_datadir}/php/Mockery1#' phpunit > phpunit.xml # single directory tree -mv src/*php src/DocBlock/ +mv src/*php src/DocBlock/ +mv src/Exception src/DocBlock/ %build @@ -151,6 +157,9 @@ exit $RETURN_CODE %changelog +* Fri Sep 18 2020 Remi Collet - 5.2.2-1 +- update to 5.2.2 + * Mon Aug 17 2020 Remi Collet - 5.2.1-1 - update to 5.2.1 diff --git a/sources b/sources index fbdf610..cd09f34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-reflection-docblock5-5.2.1-d870572.tar.gz) = 181277cbf566ae5cc545847a83e8be23f3fca7632743243069ad305fa110a7bf4956092469d1d10679ac75333c67157ea270a78a06c9ed0f7adfe3b45a778e35 +SHA512 (php-phpdocumentor-reflection-docblock5-5.2.2-069a785.tar.gz) = c6e0a326b821e09852eaf3e11011aa1fab2a7705b7f1194f9b0453575f59f1aac83d71cc4681c854c4f306fdeb2a3d3c3d67fd46fc5122c10a64a0d5b22a1157