diff options
| author | Remi Collet <remi@remirepo.net> | 2018-04-24 10:48:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-04-24 10:48:39 +0200 |
| commit | 75d6c83ae6193e9629152f1bb130b9c7e91ee6e2 (patch) | |
| tree | 5431ad0c2a7bf0a792998693802b656d89d95d3d | |
| parent | dfc869e23a4e53b8684d31dc70a3a3e5031a6b9b (diff) | |
update to 1.2.14
use range dependencies (F27+, EL-8)
| -rw-r--r-- | php-egulias-email-validator.spec | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/php-egulias-email-validator.spec b/php-egulias-email-validator.spec index b65c679..9d06315 100644 --- a/php-egulias-email-validator.spec +++ b/php-egulias-email-validator.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-egulias-email-validator # -# Copyright (c) 2014-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2014-2018 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 1.2.13 -%global github_commit b8bb147f46cc9790326ce2440a13be06cc5a63bb +%global github_version 1.2.14 +%global github_commit 5642614492f0ca2064c01d60cc33284cc2f731a9 %global composer_vendor egulias %global composer_project email-validator @@ -21,8 +21,7 @@ # "php": ">= 5.3.3" %global php_min_ver 5.3.3 # "doctrine/lexer": "^1.0.1" -# NOTE: Min version not 1.0.1 because autoloader required -%global doctrine_lexer_min_ver 1.0.1-4 +%global doctrine_lexer_min_ver 1.0.1 %global doctrine_lexer_max_ver 2.0 # Build using "--without tests" to disable tests @@ -32,10 +31,9 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: A library for validating emails -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz @@ -46,10 +44,13 @@ BuildArch: noarch BuildRequires: php-composer(phpunit/phpunit) ## composer.json BuildRequires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) +%else BuildRequires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} -#BuildRequires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver} -BuildRequires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} -## phpcompatinfo (computed from version 1.2.13) +BuildRequires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} +%endif +## phpcompatinfo (computed from version 1.2.14) BuildRequires: php-filter BuildRequires: php-pcre BuildRequires: php-reflection @@ -60,10 +61,13 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -#Requires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver} -Requires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) +%else Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} -# phpcompatinfo (computed from version 1.2.13) +Requires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} +%endif +# phpcompatinfo (computed from version 1.2.14) Requires: php-pcre Requires: php-reflection Requires: php-spl @@ -142,6 +146,10 @@ exit $RETURN_CODE %changelog +* Tue Apr 24 2018 Remi Collet <remi@remirepo.net> - 1.2.14-1 +- update to 1.2.14 +- use range dependencies (F27+, EL-8) + * Sun May 14 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.2.13-3 - Switch autoloader to php-composer(fedora/autoloader) - Test with SCLs if available |