[sepostgresql: 7/8] Merge branch 'f13' into f14

[KaiGai Kohei]

commit a2b3668c672154a56c7eaf7fae6a51db0e7696b4
Merge: 16bcec5 818aa33
Author: KaiGai Kohei <kaigai at ak.jp.nec.com>
Date:   Tue Oct 5 10:09:19 2010 +0900

    Merge branch 'f13' into f14
    
    Conflicts:
    	sepostgresql.init
    	sepostgresql.spec

 sepostgresql.init |    6 ++++++
 sepostgresql.spec |   10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --cc sepostgresql.init
index 1a2cbb6,de34def..f0b27ee
--- a/sepostgresql.init
+++ b/sepostgresql.init
@@@ -7,9 -7,6 +7,12 @@@
  # pidfile: /var/run/postmaster.pid
  #---------------------------------------------------------------------
  
++<<<<<<< HEAD
 +PGVERSION="`/bin/rpm --queryformat=%{version} -q sepostgresql`"
 +PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
 +
++=======
++>>>>>>> 818aa330e06390c6093e3af76feabb08cddf62f9
  # source function library
  . /etc/rc.d/init.d/functions
  
@@@ -22,8 -19,11 +25,11 @@@ if [ ${NAME:0:1} = "S" -o ${NAME:0:1} 
      NAME=${NAME:3}
  fi
  
+ PGVERSION=`rpm -q --queryformat='%{version}' ${NAME}`
+ PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
+ 
  # set defaults for configurable variables
 -SEPGSQL_BIN="/usr/bin"
 +SEPGSQL_CTL="/usr/bin/sepg_ctl"
  SEPGSQL_DATA="/var/lib/sepgsql/data"
  SEPGSQL_OPTS="-i -p 5432"
  SEPGSQL_STARTUP_LOG="/var/lib/sepgsql/pgstartup.log"