pool/phpMyAdmin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 247767 from home:computersalat:devel:php

Browse Source 
rollback changes introduced by fix for bnc#894107

OBS-URL: https://build.opensuse.org/request/show/247767
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=138
This commit is contained in:
Cristian Rodríguez 2014-09-05 21:22:02 +00:00 committed by Git OBS Bridge
parent 82d28385ec
commit ff691cba24
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpMyAdmin.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 5 18:39:29 UTC 2014 - chris@computersalat.de
- rollback changes introduced by fix for bnc#894107 cause they
broke apache pkg.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Aug 31 21:52:38 UTC 2014 - ecsos@schirra.net Sun Aug 31 21:52:38 UTC 2014 - ecsos@schirra.net

12
phpMyAdmin.spec
View File

@ -31,10 +31,6 @@ Name: phpMyAdmin
%define ap_grp nogroup %define ap_grp nogroup
%endif %endif
%if 0%{?suse_version} >= 1210
%define has_systemd 1
%endif
Summary: Administration of MySQL over the web Summary: Administration of MySQL over the web
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Web/Frontends Group: Productivity/Networking/Web/Frontends
@ -155,18 +151,10 @@ popd
# set PmaAbsoluteUri ### generate blowfish secret # set PmaAbsoluteUri ### generate blowfish secret
%{__sed} -i -e "s,@FQDN@,$(cat /etc/HOSTNAME)," \ %{__sed} -i -e "s,@FQDN@,$(cat /etc/HOSTNAME)," \
-e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config}
%if 0%{?has_systemd}
%service_add_post apache2.service
%else
%restart_on_update apache2 %restart_on_update apache2
%endif
%postun %postun
%if 0%{?has_systemd}
%service_del_postun apache2.service
%else
%restart_on_update apache2 %restart_on_update apache2
%endif
%clean %clean
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT