From 01b43b209c926a4300b5742a5ecfc6a91d664d9be8c60fb22e8108e9eab5442b Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Fri, 8 Sep 2017 13:03:16 +0000 Subject: [PATCH] Accepting request 522311 from home:computersalat:devel:php fix deps and post step OBS-URL: https://build.opensuse.org/request/show/522311 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=295 --- phpMyAdmin.changes | 9 +++++++++ phpMyAdmin.spec | 12 ++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index fe92aae..00a0d63 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 8 12:51:38 UTC 2017 - chris@computersalat.de + +- fix recommends + * php5-curl -> php-curl + * php5-zip -> php-zip +- fix post step + * enable correct phpX module + ------------------------------------------------------------------- Fri Aug 25 17:05:32 UTC 2017 - ecsos@opensuse.org diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index f116be7..cb5aada 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -66,8 +66,8 @@ PreReq: coreutils PreReq: grep PreReq: pwgen PreReq: sed -Recommends: php5-curl -Recommends: php5-zip +Recommends: php-curl +Recommends: php-zip ### will be removed with php >= 7.2 ## boo#1050980 Suggests: php-mcrypt @@ -169,8 +169,12 @@ sed -i -e "s,@FQDN@,$(cat %{_sysconfdir}/HOSTNAME)," \ -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} # enable required apache modules if [ -x /usr/sbin/a2enmod ]; then - a2enmod -q php5 || a2enmod php5 - a2enmod -q version || a2enmod version + # get installed php_version (5 or 7) + php_version=$(php -v | grep '(cli)' | awk '{print $2}' | awk -F'.' '{print $1}') + if [[ -n ${php_version} ]]; then + a2enmod -q php${php_version} || a2enmod php${php_version} + a2enmod -q version || a2enmod version + fi fi %if 0%{?suse_version} < 1310 %restart_on_update apache2