From 9c15a4a5850006fe8d991ffb7e2ac27e23d050ecc508ea23d043eae55be1f8cb Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sat, 8 Mar 2014 17:20:10 +0000
Subject: [PATCH] Accepting request 225009 from
 home:aeneas_jaissle:branches:server:php:applications

https://bugzilla.novell.com/show_bug.cgi?id=847179#c7

OBS-URL: https://build.opensuse.org/request/show/225009
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=71
---
 roundcubemail.changes | 5 +++++
 roundcubemail.spec    | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/roundcubemail.changes b/roundcubemail.changes
index 3ca534c..6351a13 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  7 11:24:50 UTC 2014 - aj@ajaissle.de
+
+- Use macros for DES string replacement
+
 -------------------------------------------------------------------
 Mon Feb 24 14:02:07 UTC 2014 - aj@ajaissle.de
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 833998a..7640dea 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -201,7 +201,10 @@ function makedesstr () {
     done
     echo $str
 }
-sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" /etc/roundcubemail/main.inc.php || : &> /dev/null
+if [ -f %{roundcubeconfigpath}/main.inc.php ]; then
+  sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/main.inc.php || : &> /dev/null
+fi
+sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/main.inc.php.dist || : &> /dev/null
 
 # enable apache required apache modules
 if [ -x /usr/sbin/a2enmod ]; then