Hello community,

here is the log from the commit of package phpMyAdmin for openSUSE:Factory 
checked in at 2017-09-09 20:26:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old)
 and      /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "phpMyAdmin"

Sat Sep  9 20:26:54 2017 rev:142 rq:522312 version:4.7.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes    2017-08-28 
15:18:18.651067183 +0200
+++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes       
2017-09-09 20:26:56.070709590 +0200
@@ -1,0 +2,9 @@
+Fri Sep  8 12:51:38 UTC 2017 - [email protected]
+
+- fix recommends
+  * php5-curl -> php-curl
+  * php5-zip -> php-zip
+- fix post step
+  * enable correct phpX module
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.qL35vY/_old  2017-09-09 20:26:56.966583316 +0200
+++ /var/tmp/diff_new_pack.qL35vY/_new  2017-09-09 20:26:56.966583316 +0200
@@ -66,8 +66,8 @@
 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 @@
  -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
+  # 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




Reply via email to