summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--phpMyAdmin.spec10
2 files changed, 9 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index 0b6d1a1..d7d70ce 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"ext-xml": "*",
"ext-pcre": "*",
"ext-json": "*",
- "phpmyadmin/sql-parser": "^4.1.10",
+ "phpmyadmin/sql-parser": "^4.2.3",
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"tecnickcom/tcpdf": "^6.2",
@@ -57,7 +57,7 @@
},
"require-dev": {
"phpunit/phpunit": "~4.1",
- "codacy/coverage": "dev-master",
+ "codacy/coverage": "^1.3.0",
"phpunit/phpunit-selenium": "~1.2",
"squizlabs/php_codesniffer": "2.*",
"phpmyadmin/coding-standard": ">=0.1.0"
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 6912f8b..0a5474d 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -22,7 +22,7 @@
%endif
Name: phpMyAdmin
-Version: 4.7.4
+Version: 4.7.5
Release: 1%{?dist}
Summary: Web based MySQL browser written in php
@@ -59,7 +59,7 @@ Suggests: httpd
# "ext-xml": "*",
# "ext-pcre": "*",
# "ext-json": "*",
-# "phpmyadmin/sql-parser": "^4.1.10",
+# "phpmyadmin/sql-parser": "^4.2.3",
# "phpmyadmin/motranslator": "^3.0",
# "phpmyadmin/shapefile": "^2.0",
# "tecnickcom/tcpdf": "^6.2",
@@ -73,7 +73,7 @@ Requires: php-xml
Requires: php-pcre
Requires: php-json
Requires: php-composer(phpmyadmin/sql-parser) < 5
-Requires: php-composer(phpmyadmin/sql-parser) >= 4.1.10
+Requires: php-composer(phpmyadmin/sql-parser) >= 4.2.3
Requires: php-composer(phpmyadmin/motranslator) < 4
Requires: php-composer(phpmyadmin/motranslator) >= 3.0
Requires: php-composer(phpmyadmin/shapefile) < 3
@@ -260,6 +260,10 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Mon Oct 23 2017 Remi Collet <remi@remirepo.net> 4.7.5-1
+- update to 4.7.5 (2017-10-23, regular maintenance release)
+- raise dependency on phpmyadmin/sql-parser version 4.2.3
+
* Thu Aug 24 2017 Remi Collet <remi@remirepo.net> 4.7.4-1
- update to 4.7.4 (2017-07-24, regular maintenance release)
- raise dependency on phpmyadmin/sql-parser version 4.1.10