diff options
Diffstat (limited to 'phpMyAdmin.spec')
| -rw-r--r-- | phpMyAdmin.spec | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 3b1c9d0..62df4c2 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -1,4 +1,5 @@ # remirepo spec file for phpMyAdmin +# remirepo:3 # # Copyright (c) 2008-2020 Remi Collet # @@ -27,7 +28,7 @@ Name: phpMyAdmin Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A web interface for MySQL and MariaDB # MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/) @@ -40,6 +41,8 @@ Source1: https://files.phpmyadmin.net/%{name}/%{upstream_version}%{?upstream_pre Source2: phpMyAdmin.htaccess Source3: phpMyAdmin.nginx Source4: https://files.phpmyadmin.net/phpmyadmin.keyring +# remirepo:1 +Source10: phpMyAdmin.htaccess22 # Redirect to system certificates Patch0: phpMyAdmin-certs.patch @@ -261,7 +264,14 @@ mkdir -p %{buildroot}/%{_datadir}/%{name} cp -ad ./* %{buildroot}/%{_datadir}/%{name} install -Dpm 0640 CONFIG %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php # Apache +# remirepo:4 +%if 0%{?rhel} == 6 +# old config file with Apache 2.2/2.4 compatibility +install -Dpm 0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf +%else install -Dpm 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf +# remirepo:1 +%endif # Nginx %if %{with_nginx} install -Dpm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/nginx/default.d/phpMyAdmin.conf @@ -330,6 +340,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Tue Mar 24 2020 Remi Collet <remi@remirepo.net> 5.0.2-2 +- cleanup httpd configuration + * Sat Mar 21 2020 Remi Collet <remi@remirepo.net> 5.0.2-1 - update to 5.0.2 (2020-03-21, security release) - use phpmyadmin/twig-i18n-extension instead of twig/extensions |