[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: only create session DB in x2goserver's post install script.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 825df7b5def2e4cc05cc2e3b1a6fc2d630b4bc7c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Mar 3 23:54:43 2015 +0100

    x2goserver.spec: only create session DB in x2goserver's post install script.
    
    Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB
    and x2goserver-common are available when x2goserver's post install
    script is being executed.
    
    Fixes installation bugs reported by Michael DePaulo.
---
 debian/changelog |    5 +++++
 x2goserver.spec  |   15 +++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f53a0b0..c3c397e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -150,6 +150,11 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
   [ Mihai Moldovan ]
   * New upstream version (4.1.0.0):
     - Change string "X2go" to "X2Go" where appropriate.
+  * x2goserver.spec:
+    - Only create session DB in x2goserver's post install script. Do use
+      proper Requires(post) statements to make sure perl-X2Go-Server-DB and
+      x2goserver-common are available when x2goserver's post install script is
+      being executed. Fixes installation bugs reported by Michael DePaulo.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 09 May 2014 13:06:24 +0200
 
diff --git a/x2goserver.spec b/x2goserver.spec
index 9651bce..a8347cd 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -126,6 +126,8 @@ Requires(postun): systemd
 %endif
 
 Requires:       perl-X2Go-Server = %{version}-%{release}
+Requires(post): perl-X2Go-Server-DB
+Requires(post): x2goserver-common
 Requires:       x2goserver-extensions
 Requires:       x2goserver-xsession
 #Recommands:       x2goserver-fmbindings
@@ -486,10 +488,8 @@ fi
 %post
 # Initialize the session database
 if [ ! -s %{_localstatedir}/lib/x2go/x2go_sessions ]; then
-  if [ -d %{_datadir}/doc/packages/perl-X2Go-Server-DB ]; then
-    if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>&1; then
+  if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>&1; then
       %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>&1 || :
-    fi
   fi
 fi
 
@@ -538,15 +538,6 @@ fi
 
 
 %post -n perl-X2Go-Server-DB
-# Initialize the session database
-if [ ! -s %{_localstatedir}/lib/x2go/x2go_sessions ]; then
-  if [ -x %{_sbindir}/x2godbadmin ]; then
-    if grep -E "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null 2>&1; then
-      %{_sbindir}/x2godbadmin --createdb 1>/dev/null 2>&1 || :
-    fi
-  fi
-fi
-
 %if 0%{?suse_version}
 %if 0%{?suse_version} <= 1130
 %run_permissions

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git