summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-12-07 11:38:27 +0100
committerRemi Collet <remi@remirepo.net>2018-12-07 11:38:27 +0100
commitead4e9320ad776990a1f2b83ba4c06b56e2c7eae (patch)
tree04353a060b2df716cb94ebfe661b69b2e0c83eef
parent5f2ab3ce9069a02ac48f9820083cfd7fa0ed8b74 (diff)
use range dependenciesHEADmaster
-rw-r--r--php-phpmyadmin-motranslator.spec20
1 files changed, 16 insertions, 4 deletions
diff --git a/php-phpmyadmin-motranslator.spec b/php-phpmyadmin-motranslator.spec
index 1130ab0..b8892fe 100644
--- a/php-phpmyadmin-motranslator.spec
+++ b/php-phpmyadmin-motranslator.spec
@@ -15,7 +15,8 @@
%global ns_vendor PhpMyAdmin
%global ns_project MoTranslator
-%if 0%{?fedora} >= 27
+%global sym_min_ver 2.8
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
%global sym_max_ver 5
%else
%global sym_max_ver 4
@@ -23,7 +24,7 @@
Name: php-%{gh_owner}-%{gh_project}
Version: 4.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Translation API for PHP using Gettext MO files
Group: Development/Libraries
@@ -35,11 +36,15 @@ BuildArch: noarch
%if %{with_tests}
BuildRequires: php(language) >= 5.3
BuildRequires: php-pcre
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(symfony/expression-language) >= %{sym_min_ver} with php-composer(symfony/expression-language) < %{sym_max_ver})
+%else
BuildRequires: php-composer(symfony/expression-language) < %{sym_max_ver}
+%endif
# For tests, from composer.json "require-dev": {
# "phpunit/php-code-coverage": "*",
# "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5"
-%if 0%{?fedora} >= 26
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
%global phpunit %{_bindir}/phpunit6
%else
%global phpunit %{_bindir}/phpunit
@@ -52,7 +57,11 @@ BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require": {
# "php": ">=5.3.0",
# "symfony/expression-language": ""^4.0 || ^3.2 || ^2.8"
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(symfony/expression-language) >= %{sym_min_ver} with php-composer(symfony/expression-language) < %{sym_max_ver})
+%else
Requires: php-composer(symfony/expression-language) < %{sym_max_ver}
+%endif
Requires: php(language) >= 5.3
# From phpcompatinfo report for 1.2
Requires: php-pcre
@@ -117,7 +126,7 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php';
EOF
ret=0
-for cmd in "php %{phpunit}" php71 php72; do
+for cmd in "php %{phpunit}" php71 php72 php73; do
if which $cmd; then
set $cmd
$1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1
@@ -139,6 +148,9 @@ exit $ret
%changelog
+* Fri Dec 7 2018 Remi Collet <remi@remirepo.net> - 4.0-3
+- use range dependencies
+
* Wed Feb 21 2018 Remi Collet <remi@remirepo.net> - 4.0-1
- Update to 4.0