From 57302603d36f686399fd58d504f1f043d9440b5e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Aug 2017 17:08:22 +0200 Subject: update to 4.7.4 (2017-07-24, regular maintenance release) raise dependency on phpmyadmin/sql-parser version 4.1.10 --- composer.json | 2 +- phpMyAdmin.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 4f7c552..0b6d1a1 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ext-xml": "*", "ext-pcre": "*", "ext-json": "*", - "phpmyadmin/sql-parser": "^4.1.9", + "phpmyadmin/sql-parser": "^4.1.10", "phpmyadmin/motranslator": "^3.0", "phpmyadmin/shapefile": "^2.0", "tecnickcom/tcpdf": "^6.2", diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 7cdf6af..6912f8b 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -22,7 +22,7 @@ %endif Name: phpMyAdmin -Version: 4.7.3 +Version: 4.7.4 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.2", +# "phpmyadmin/sql-parser": "^4.1.10", # "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.9 +Requires: php-composer(phpmyadmin/sql-parser) >= 4.1.10 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 +* Thu Aug 24 2017 Remi Collet 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 + * Tue Aug 1 2017 Remi Collet 4.7.3-1 - update to 4.7.3 (2017-07-20, regular maintenance release) -- cgit