summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--phpMyAdmin.spec11
2 files changed, 8 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index b6d09b1..4f7c552 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"ext-xml": "*",
"ext-pcre": "*",
"ext-json": "*",
- "phpmyadmin/sql-parser": "^4.1.7",
+ "phpmyadmin/sql-parser": "^4.1.9",
"phpmyadmin/motranslator": "^3.0",
"phpmyadmin/shapefile": "^2.0",
"tecnickcom/tcpdf": "^6.2",
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 73f0113..7cdf6af 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -22,7 +22,7 @@
%endif
Name: phpMyAdmin
-Version: 4.7.2
+Version: 4.7.3
Release: 1%{?dist}
Summary: Web based MySQL browser written in php
@@ -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.7
+Requires: php-composer(phpmyadmin/sql-parser) >= 4.1.9
Requires: php-composer(phpmyadmin/motranslator) < 4
Requires: php-composer(phpmyadmin/motranslator) >= 3.0
Requires: php-composer(phpmyadmin/shapefile) < 3
@@ -127,9 +127,9 @@ Provides: bundled(js-openlayers)
Provides: bundled(js-tracekit)
Provides: php-composer(phpmyadmin/phpmyadmin) = %{version}
+# Update from rpmforge
+Obsoletes: phpmyadmin < %{version}
Provides: phpmyadmin = %{version}-%{release}
-Obsoletes: phpMyAdmin3
-Obsoletes: phpMyAdmin4
%description
@@ -260,6 +260,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Tue Aug 1 2017 Remi Collet <remi@remirepo.net> 4.7.3-1
+- update to 4.7.3 (2017-07-20, regular maintenance release)
+
* Fri Jun 30 2017 Remi Collet <remi@remirepo.net> 4.7.2-1
- update to 4.7.2 (2017-06-29, regular maintenance release)
- raise dependency on phpmyadmin/sql-parser version 4.1.7