diff options
Diffstat (limited to 'phpMyAdmin.spec')
| -rw-r--r-- | phpMyAdmin.spec | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 9661e4b..132ef5a 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -20,12 +20,12 @@ %global with_httpd 0 %endif -%global upstream_version 4.9.0.1 +%global upstream_version 4.9.1 #global upstream_prever rc1 Name: phpMyAdmin Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Web based MySQL browser written in php # MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/) @@ -37,11 +37,13 @@ Source0: https://files.phpmyadmin.net/%{name}/%{upstream_version}%{?upstream_pre Source1: https://files.phpmyadmin.net/%{name}/%{upstream_version}%{?upstream_prever:-%upstream_prever}/%{name}-%{upstream_version}%{?upstream_prever:-%upstream_prever}-all-languages.tar.xz.asc Source2: phpMyAdmin.htaccess Source3: phpMyAdmin.nginx +Source4: https://files.phpmyadmin.net/phpmyadmin.keyring # Redirect to system certificates Patch0: phpMyAdmin-certs.patch BuildArch: noarch +BuildRequires: gnupg2 Requires(post): coreutils sed Requires: webserver @@ -67,7 +69,7 @@ Suggests: httpd # "phpseclib/phpseclib": "^2.0", # "google/recaptcha": "^1.1", # "psr/container": "^1.0", -# "twig/twig": "^1.34", +# "twig/twig": "^1.34 || ^2.0", # "twig/extensions": "~1.5.1", # "symfony/expression-language": "^3.2 || ^2.8", # "symfony/polyfill-mbstring": "^1.3" @@ -91,7 +93,7 @@ Requires: (php-composer(phpmyadmin/shapefile) >= 2.0 with php-composer 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) Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) -Requires: (php-composer(twig/twig) >= 1.34 with php-composer(twig/twig) < 2) +Requires: (php-composer(twig/twig) >= 1.34 with php-composer(twig/twig) < 3) Requires: (php-composer(twig/extensions) >= 1.5.1 with php-composer(twig/extensions) < 2) Requires: (php-composer(symfony/expression-language) >= 2.8 with php-composer(symfony/expression-language) < 4) Requires: (php-composer(symfony/polyfill-mbstring) >= 1.3 with php-composer(symfony/polyfill-mbstring) < 2) @@ -181,6 +183,8 @@ is available in 50 languages %prep +%{?gpgverify:%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'} + %setup -qn phpMyAdmin-%{upstream_version}%{?upstream_prever:-%upstream_prever}-all-languages %patch0 -p1 @@ -222,7 +226,10 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; '%{_datadir}/php/phpseclib/autoload.php', '%{_datadir}/php/ReCaptcha/autoload.php', '%{_datadir}/php/Psr/Container/autoload.php', - '%{_datadir}/php/Twig/autoload.php', + [ + '%{_datadir}/php/Twig2/autoload.php', + '%{_datadir}/php/Twig/autoload.php', + ], '%{_datadir}/php/Twig/Extensions/autoload.php', [ '%{_datadir}/php/Symfony3/Component/ExpressionLanguage/autoload.php', @@ -317,6 +324,11 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Sat Sep 21 2019 Remi Collet <remi@remirepo.net> - 4.9.1-1 +- update to 4.9.1 (2019-09-21, bug fix release) +- add tarball signature check +- allow twig version 2 + * Mon Sep 2 2019 Remi Collet <remi@remirepo.net> - 4.9.0.1-2 - make optional depencencies mandatory on EL <= 7 see https://superuser.com/questions/1472237 |