summaryrefslogtreecommitdiffstats
path: root/php-doctrine-reflection.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-doctrine-reflection.spec')
-rw-r--r--php-doctrine-reflection.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/php-doctrine-reflection.spec b/php-doctrine-reflection.spec
index 4b74a1b..3e99b7a 100644
--- a/php-doctrine-reflection.spec
+++ b/php-doctrine-reflection.spec
@@ -27,7 +27,7 @@
Name: php-%{pk_vendor}-%{pk_project}
Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional reflection functionality
Group: Development/Libraries
@@ -51,9 +51,11 @@ BuildRequires: php-tokenizer
# "doctrine/coding-standard": "^4.0",
# "doctrine/common": "^2.8",
# "squizlabs/php_codesniffer": "^3.0"
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2)
BuildRequires: (php-composer(doctrine/common) >= 2.8 with php-composer(doctrine/common) < 3)
+# remirepo:6
%else
BuildRequires: php-composer(doctrine/annotations) < 2
BuildRequires: php-composer(doctrine/annotations) >= 1.0
@@ -67,8 +69,10 @@ BuildRequires: phpunit7
# "php": "^7.1"
# "doctrine/annotations": "^1.0"
Requires: php(language) >= 7.1
+# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(doctrine/annotations) >= 1.0 with php-composer(doctrine/annotations) < 2)
+# remirepo:4
%else
Requires: php-composer(doctrine/annotations) < 2
Requires: php-composer(doctrine/annotations) >= 1.0
@@ -83,7 +87,7 @@ Requires: php-composer(fedora/autoloader)
Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version}
# Split off doctrine/common
-Conflicts: php-doctrine-common < 2.9
+Conflicts: php-doctrine-common < 1:2.9
%description
@@ -135,6 +139,7 @@ EOF
# we don't want PHPStan (which pull nette framework)
find tests -type f -exec grep -q PHPStan {} \; -delete -print
+
: Run test suite
ret=0
for cmd in php php71 php72 php73; do
@@ -159,5 +164,8 @@ exit $ret
%changelog
+* Thu Nov 22 2018 Remi Collet <remi@remirepo.net> - 1.0.0-2
+- fix conflicts
+
* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 1.0.0-1
- initial package, version 1.0.0