diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpmyadmin-sql-parser.spec | 11 | 
2 files changed, 8 insertions, 5 deletions
diff --git a/composer.json b/composer.json index f4af964..71fd249 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@          "sami/sami": "^4.0",          "phpunit/php-code-coverage": "*",          "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5", -        "squizlabs/php_codesniffer": "^2.9" +        "squizlabs/php_codesniffer": "~2.9 || ~3.4"      },      "conflict": {          "phpmyadmin/motranslator": "<3.0" diff --git a/php-phpmyadmin-sql-parser.spec b/php-phpmyadmin-sql-parser.spec index 9264013..9464072 100644 --- a/php-phpmyadmin-sql-parser.spec +++ b/php-phpmyadmin-sql-parser.spec @@ -1,13 +1,13 @@  # remirepo/fedora spec file for php-phpmyadmin-sql-parser  # -# Copyright (c) 2015-2019 Remi Collet +# Copyright (c) 2015-2020 Remi Collet  # License: CC-BY-SA  # http://creativecommons.org/licenses/by-sa/4.0/  #  # Please, preserve the changelog entries  # -%global gh_commit    35a895a1ad4f4b068e44c4cd17c04759c71eed13 +%global gh_commit    b00f1c29ff80d0b68afaaa67a2d6b01ae74310f7  %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.4.0 +Version:        4.5.0  Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}  Summary:        A validating SQL lexer and parser with a focus on MySQL dialect @@ -37,7 +37,7 @@ BuildRequires:  php-mbstring  # For tests, from composer.json "require-dev": {  #        "phpunit/php-code-coverage": "*",  #        "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5", -#        "squizlabs/php_codesniffer": "^2.9" +#        "squizlabs/php_codesniffer": "~2.9 || ~3.4"  %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8  BuildRequires:  phpunit6 >= 6.5  %global phpunit %{_bindir}/phpunit6 @@ -180,6 +180,9 @@ exit $ret  %changelog +* Wed Jan  8 2020 Remi Collet <remi@remirepo.net> - 4.5.0-1 +- update to 4.5.0 +  * Tue Nov 12 2019 Remi Collet <remi@remirepo.net> - 4.4.0-1  - update to 4.4.0  - drop patch merged upstream  | 
