diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 27 |
2 files changed, 22 insertions, 9 deletions
diff --git a/composer.json b/composer.json index cc181ed..11e4343 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "docs": "https://docs.phpmyadmin.net/", "source": "https://github.com/phpmyadmin/phpmyadmin" }, - "license": "GPL-2.0", + "license": "GPL-2.0-only", "authors": [ { "name": "The phpMyAdmin Team", @@ -39,7 +39,7 @@ "ext-pcre": "*", "ext-json": "*", "phpmyadmin/sql-parser": "^4.2.3", - "phpmyadmin/motranslator": "^3.4", + "phpmyadmin/motranslator": "^4.0", "phpmyadmin/shapefile": "^2.0", "tecnickcom/tcpdf": "^6.2", "phpseclib/phpseclib": "^2.0", diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index c1f6c4f..23b2261 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -1,6 +1,6 @@ # remirepo spec file for phpMyAdmin # -# Copyright (c) 2008-2017 Remi Collet +# Copyright (c) 2008-2018 Remi Collet # # Fedora spec file for phpMyAdmin # @@ -22,11 +22,10 @@ %endif Name: phpMyAdmin -Version: 4.7.7 +Version: 4.7.8 Release: 1%{?dist} Summary: Web based MySQL browser written in php -Group: Applications/Internet # MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/) # BSD (js/openlayers/) # GPLv2+ (the rest) @@ -60,7 +59,7 @@ Suggests: httpd # "ext-pcre": "*", # "ext-json": "*", # "phpmyadmin/sql-parser": "^4.2.3", -# "phpmyadmin/motranslator": "^3.4", +# "phpmyadmin/motranslator": "^4.0", # "phpmyadmin/shapefile": "^2.0", # "tecnickcom/tcpdf": "^6.2", # "phpseclib/phpseclib": "^2.0", @@ -74,19 +73,28 @@ Requires: php-openssl Requires: php-xml Requires: php-pcre Requires: php-json +Requires: php-tcpdf-dejavu-sans-fonts +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(phpmyadmin/sql-parser) >= 4.2.3 with php-composer(phpmyadmin/sql-parser) < 5) +Requires: (php-composer(phpmyadmin/motranslator) >= 4.0 with php-composer(phpmyadmin/motranslator) < 5) +Requires: (php-composer(phpmyadmin/shapefile) >= 2.0 with php-composer(phpmyadmin/shapefile) < 3) +Requires: (php-composer(tecnickcom/tcpdf) >= 6.2 with php-composer(tecnickcom/tcpdf) < 7) +Requires: (php-composer(phpseclib/phpseclib) >= 2.0.9 with php-composer(phpseclib/phpseclib) < 3) +Requires: (php-composer(google/recaptcha) >= 1.1 with php-composer(google/recaptcha) < 2) +%else Requires: php-composer(phpmyadmin/sql-parser) < 5 Requires: php-composer(phpmyadmin/sql-parser) >= 4.2.3 -Requires: php-composer(phpmyadmin/motranslator) < 4 -Requires: php-composer(phpmyadmin/motranslator) >= 3.4 +Requires: php-composer(phpmyadmin/motranslator) < 5 +Requires: php-composer(phpmyadmin/motranslator) >= 4.0 Requires: php-composer(phpmyadmin/shapefile) < 3 Requires: php-composer(phpmyadmin/shapefile) >= 2.0 Requires: php-composer(tecnickcom/tcpdf) < 7 Requires: php-composer(tecnickcom/tcpdf) >= 6.2 -Requires: php-tcpdf-dejavu-sans-fonts Requires: php-composer(phpseclib/phpseclib) < 3 Requires: php-composer(phpseclib/phpseclib) >= 2.0.9 Requires: php-composer(google/recaptcha) < 2 Requires: php-composer(google/recaptcha) >= 1.1 +%endif # Autoloader Requires: php-composer(fedora/autoloader) # From composer.json, "suggest": { @@ -262,6 +270,11 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Wed Feb 21 2018 Remi Collet <remi@remirepo.net> 4.7.8-1 +- update to 4.7.8 (2018-02-20, security release) +- raise dependency on phpmyadmin/motranslator version 4.0 +- use range dependencies on F27+ + * Sat Dec 23 2017 Remi Collet <remi@remirepo.net> 4.7.7-1 - update to 4.7.7 (2017-12-23, security release) - raise dependency on phpmyadmin/motranslator version 3.4 |