Accepting request 522312 from server:php:applications
fix deps and post step (forwarded request 522311 from computersalat) OBS-URL: https://build.opensuse.org/request/show/522312 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/phpMyAdmin?expand=0&rev=142
This commit is contained in:
commit
c93df25740
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user