summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-phpmyadmin-sql-parser5.spec21
2 files changed, 12 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index 51a13f6..d537efd 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,12 @@
},
"require-dev": {
"phpmyadmin/coding-standard": "^1.0",
- "phpmyadmin/motranslator": "^4.0",
+ "phpmyadmin/motranslator": "^4.0 || ^5.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.3",
"phpstan/phpstan-phpunit": "^0.12.1",
"phpunit/php-code-coverage": "*",
- "phpunit/phpunit": "^7.4 || ^8"
+ "phpunit/phpunit": "^7.4 || ^8 || ^9"
},
"conflict": {
"phpmyadmin/motranslator": "<3.0"
diff --git a/php-phpmyadmin-sql-parser5.spec b/php-phpmyadmin-sql-parser5.spec
index 1dfb906..2f1ce8c 100644
--- a/php-phpmyadmin-sql-parser5.spec
+++ b/php-phpmyadmin-sql-parser5.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
-%global gh_commit bddaf056f8f43621e94b29284c98f35db8b6d93e
+%global gh_commit 11457e9bbedc182b48c04db3a2621d17b58b0808
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phpmyadmin
#global gh_date 20150820
@@ -18,7 +18,7 @@
%global major 5
Name: php-%{gh_owner}-%{gh_project}%{major}
-Version: 5.2.0
+Version: 5.3.1
Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
Summary: A validating SQL lexer and parser with a focus on MySQL dialect
@@ -38,19 +38,14 @@ BuildRequires: php-mbstring
BuildRequires: php-spl
# For tests, from composer.json "require-dev": {
# "phpmyadmin/coding-standard": "^1.0",
-# "phpmyadmin/motranslator": "^4.0",
+# "phpmyadmin/motranslator": "^4.0 || ^5.0",
# "phpstan/extension-installer": "^1.0",
# "phpstan/phpstan": "^0.12.3",
# "phpstan/phpstan-phpunit": "^0.12.1",
# "phpunit/php-code-coverage": "*",
-# "phpunit/phpunit": "^7.4 || ^8"
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+# "phpunit/phpunit": "^7.4 || ^8 || 9"
BuildRequires: phpunit8
%global phpunit %{_bindir}/phpunit8
-%else
-BuildRequires: phpunit7 >= 7.4
-%global phpunit %{_bindir}/phpunit7
-%endif
%endif
# For autoloader
BuildRequires: php-composer(fedora/autoloader)
@@ -100,9 +95,10 @@ cat <<'AUTOLOAD' | tee src/autoload.php
require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__);
-\Fedora\Autoloader\Dependencies::required(array(
+\Fedora\Autoloader\Dependencies::required([
+ '%{_datadir}/php/PhpMyAdmin/MoTranslator5/autoload.php',
'%{_datadir}/php/PhpMyAdmin/MoTranslator/autoload.php',
-));
+]);
AUTOLOAD
@@ -186,6 +182,9 @@ exit $ret
%changelog
+* Sat Mar 21 2020 Remi Collet <remi@remirepo.net> - 5.3.1-1
+- update to 5.3.1
+
* Wed Jan 8 2020 Remi Collet <remi@remirepo.net> - 5.2.0-1
- update to 5.2.0