summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-phpdocumentor-reflection-docblock5.spec23
1 files changed, 15 insertions, 8 deletions
diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec
index 77b6ca3..8b4b495 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
@@ -46,17 +46,20 @@ BuildRequires: php-phpdocumentor-reflection-common2 >= 2.2
%endif
# From composer.json, require-dev
# "mockery/mockery": "~1.3.2"
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-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
-# remirepo:5
%else
-BuildRequires: php-mockery >= 1.3.2
BuildRequires: phpunit8
%global phpunit %{_bindir}/phpunit8
%endif
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(mockery/mockery) >= 1.3.2 with php-composer(mockery/mockery) < 2)
+# remirepo:3
+%else
+BuildRequires: php-mockery >= 1.3.2
+%endif
# From phpcompatinfo report for 5.0.0
BuildRequires: php-reflection
BuildRequires: php-pcre
@@ -109,7 +112,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
@@ -177,6 +181,9 @@ exit $RETURN_CODE
%changelog
+* Fri Sep 18 2020 Remi Collet <remi@remirepo.net> - 5.2.2-1
+- update to 5.2.2
+
* Mon Aug 17 2020 Remi Collet <remi@remirepo.net> - 5.2.1-1
- update to 5.2.1