diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index d09c708..4bb1ba0 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -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 diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 2ae2ac2..5ede9b2 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -31,10 +31,6 @@ Name: phpMyAdmin %define ap_grp nogroup %endif -%if 0%{?suse_version} >= 1210 -%define has_systemd 1 -%endif - Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends @@ -155,18 +151,10 @@ popd # set PmaAbsoluteUri ### generate blowfish secret %{__sed} -i -e "s,@FQDN@,$(cat /etc/HOSTNAME)," \ -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 -%endif %postun -%if 0%{?has_systemd} -%service_del_postun apache2.service -%else %restart_on_update apache2 -%endif %clean %{__rm} -rf $RPM_BUILD_ROOT