From f5c64e65a3e33b86fdcfa33f303c7dea8def772fb47df8dbc07af86ef4682f84 Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Sat, 2 May 2020 23:46:46 +0000
Subject: [PATCH 1/2] Accepting request 799642 from
 home:adkorte:branches:server:php:applications

- Don't expand @FQDN@ from /etc/HOSTNAME (this used to set $cfg['PmaAbsoluteUri'] parameter, but this variable is no longer in the config.sample.ini file)

OBS-URL: https://build.opensuse.org/request/show/799642
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=353
---
 phpMyAdmin.changes | 7 +++++++
 phpMyAdmin.spec    | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 65d1e5a..14309f0 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat May  2 10:54:11 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
+
+- Don't expand @FQDN@ from /etc/HOSTNAME (this used to set
+  $cfg['PmaAbsoluteUri'] parameter, but this variable is no longer
+  in the config.sample.ini file)
+
 -------------------------------------------------------------------
 Thu Apr 23 11:04:19 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 94295d0..54d9bdd 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -181,8 +181,7 @@ fi
 # on `rpm -ivh` PARAM is 1
 # on `rpm -Uvh` PARAM is 2
 # set PmaAbsoluteUri ### generate blowfish secret
-sed -i -e "s,@FQDN@,$(cat %{_sysconfdir}/HOSTNAME)," \
- -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config}
+sed -i -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config}
 # enable required apache modules
 if [ -x %{_sbindir}/a2enmod ]; then
   a2enmod -q version || a2enmod version

From fabe47cb0577fb58887b5862bf46a9f7bdf139c2130df42f9aabf809852a7d45 Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Sun, 3 May 2020 15:30:54 +0000
Subject: [PATCH 2/2] Accepting request 799851 from
 home:computersalat:devel:php

fix for boo#1170743

OBS-URL: https://build.opensuse.org/request/show/799851
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=354
---
 phpMyAdmin.changes |  6 ++++++
 phpMyAdmin.spec    | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 14309f0..806e840 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun May  3 15:22:25 UTC 2020 - chris@computersalat.de
+
+- fix for boo#1170743
+  phpMyAdmin installation wipes it's sysconfig apache_server_flag entry
+
 -------------------------------------------------------------------
 Sat May  2 10:54:11 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 54d9bdd..a1f3f6e 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -167,19 +167,23 @@ sed -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \
 # removing tmp/twig before ap_docroot change
 # a new one will be created anyway in new ap_docroot (like after a clean install)
 if [ -d "%{ap_docroot_old}/%{name}/tmp" ]; then
-  echo "removing %{ap_docroot_old}/%{name}/tmp for ap_docroot change"
+  echo "info: removing %{ap_docroot_old}/%{name}/tmp for ap_docroot change"
   rm -rf "%{ap_docroot_old}/%{name}/tmp" || :
 fi
 
 %preun
 if [ $1 -eq 0 ]; then
-  echo "removing %{ap_docroot}/%{name}/tmp for clean uninstall"
+if [ -d "%{ap_docroot}/%{name}/tmp" ]; then
+  echo "info: removing %{ap_docroot}/%{name}/tmp for clean uninstall"
   rm -rf "%{ap_docroot}/%{name}/tmp" || :
 fi
+fi
 
 %post
-# on `rpm -ivh` PARAM is 1
-# on `rpm -Uvh` PARAM is 2
+# FIRST_ARG values on
+# uninstall:    0
+# install:      1
+# update:       2
 # set PmaAbsoluteUri ### generate blowfish secret
 sed -i -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config}
 # enable required apache modules
@@ -190,6 +194,7 @@ if [ -x %{_sbindir}/a2enmod ]; then
   # php_version=$(awk -F[." "] '/cli/ {print $2}' <<< $(php -v))
   php_version=$(php -v | sed -n 's/^PHP\ \([[:digit:]]\+\)\..*$/\1/p')
   if [[ -n ${php_version} ]] && start_apache2 -V | grep -q prefork; then
+    echo "info: adding php${php_version} to APACHE_MODULES"
     a2enmod -q "php${php_version}" || a2enmod "php${php_version}"
   fi
 fi
@@ -197,6 +202,7 @@ fi
 if [ -x %{_sbindir}/a2enflag ]; then
   flag_find=$(grep -cw /etc/sysconfig/apache2 -e "^APACHE_SERVER_FLAGS=.*%{name}.*")
   if [ $flag_find -eq 0 ]; then
+    echo "info: adding %{name} to APACHE_SERVER_FLAGS"
     a2enflag %{name}
   fi
 fi
@@ -216,13 +222,17 @@ fi
 #systemctl try-restart apache2 &>/dev/null
 
 %postun
+# only do on uninstall, not on update
+if [ $1 -eq 0 ]; then
 # disable phpMyAdmin flag
 if [ -x %{_sbindir}/a2enflag ]; then
   flag_find=$(grep -cw /etc/sysconfig/apache2 -e "^APACHE_SERVER_FLAGS=.*%{name}.*")
   if [ $flag_find -eq 1 ]; then
+    echo "info: removing %{name} from APACHE_SERVER_FLAGS"
     a2enflag -d %{name}
   fi
 fi
+fi
 %restart_on_update apache2
 #systemctl try-restart apache2 &>/dev/null