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

Accepting request 246859 from home:computersalat:devel:php

Browse Source 
fix for bnc#894107, fix changes file

OBS-URL: https://build.opensuse.org/request/show/246859
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=135
This commit is contained in:
Christian Wittmer 2014-08-29 15:28:44 +00:00 committed by Git OBS Bridge
parent 228ac4ac98
commit 20f8ea918e
2 changed files with 24 additions and 6 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 Aug 29 14:58:31 UTC 2014 - chris@computersalat.de
- fix for bnc#894107
* fix post/postun for systemd
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 19 21:46:14 UTC 2014 - chris@computersalat.de Tue Aug 19 21:46:14 UTC 2014 - chris@computersalat.de

12
phpMyAdmin.spec
View File

@ -31,6 +31,10 @@ 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
@ -151,10 +155,18 @@ 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