diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-02-08 13:55:30 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-02-08 13:55:30 +0100 |
| commit | 0adec976a7efe76c353dc812cab1d5cccac5eb96 (patch) | |
| tree | 9eaa96557c6456ac6cae6936cf4ae7e47b8b8afc | |
| parent | 8cbc8734d84011feb6a3c0377f24edb364d14084 (diff) | |
php-phpmyadmin-sql-parser: 4.1.1
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-phpmyadmin-sql-parser.spec | 32 |
2 files changed, 21 insertions, 18 deletions
diff --git a/composer.json b/composer.json index 6bf3df2..28cdaed 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,18 @@ }, "require": { "php": ">=5.3.0", - "phpmyadmin/motranslator": "~3.0", "ext-mbstring": "*" }, "require-dev": { "phpunit/php-code-coverage": "~2.0 || ~3.0", "phpunit/phpunit": "~4.8 || ~5.1" }, + "conflict": { + "phpmyadmin/motranslator": "<3.0" + }, + "suggest": { + "phpmyadmin/motranslator": "Translate messages to your favorite locale" + }, "bin": [ "bin/highlight-query", "bin/lint-query" diff --git a/php-phpmyadmin-sql-parser.spec b/php-phpmyadmin-sql-parser.spec index 9746578..c60553c 100644 --- a/php-phpmyadmin-sql-parser.spec +++ b/php-phpmyadmin-sql-parser.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit 4e886a6aec1870b2660b9985c2d72cd276da5683 +%global gh_commit a371e1669edfbf2fea9e533488eee5da06535773 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpmyadmin #global gh_date 20150820 @@ -17,7 +17,7 @@ %global ns_project SqlParser Name: php-%{gh_owner}-%{gh_project} -Version: 4.1.0 +Version: 4.1.1 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: A validating SQL lexer and parser with a focus on MySQL dialect @@ -46,8 +46,12 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=5.3.0", -# "phpmyadmin/motranslator": "~3.0", # "ext-mbstring": "*" +# From composer.json, "conflict": { +# "phpmyadmin/motranslator": "<3.0" +# From composer.json, "suggest": { +# "phpmyadmin/motranslator": "Translate messages to your favorite locale" + Requires: php(language) >= 5.3 Requires: php-composer(phpmyadmin/motranslator) < 4 Requires: php-composer(phpmyadmin/motranslator) >= 3.0 @@ -127,21 +131,12 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\', dirname(__DIR__).'/tests'); EOF -# remirepo:11 -run=0 ret=0 -if which php56; then - php56 %{_bindir}/phpunit --no-coverage || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/phpunit --no-coverage || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --no-coverage --verbose -# remirepo:2 -fi +for cmd in php56 php70 php71 php; do + if which $cmd; then + $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1 + fi +done exit $ret %else : Test suite disabled @@ -173,6 +168,9 @@ exit $ret %changelog +* Wed Feb 8 2017 Remi Collet <remi@fedoraproject.org> - 4.1.1-1 +- update to 4.1.1 + * Mon Jan 23 2017 Remi Collet <remi@fedoraproject.org> - 4.1.0-1 - update to 4.1.0 - add dependency on phpmyadmin/motranslator |