[sepostgresql: 6/8] upgrade base version to 9.0.0

[KaiGai Kohei]

commit 818aa330e06390c6093e3af76feabb08cddf62f9
Author: KaiGai Kohei <kaigai at ak.jp.nec.com>
Date:   Tue Oct 5 10:07:52 2010 +0900

    upgrade base version to 9.0.0

 sepostgresql.init |    6 +++---
 sepostgresql.spec |   14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/sepostgresql.init b/sepostgresql.init
index 866aaba..de34def 100644
--- a/sepostgresql.init
+++ b/sepostgresql.init
@@ -7,9 +7,6 @@
 # pidfile: /var/run/postmaster.pid
 #---------------------------------------------------------------------
 
-PGVERSION="8.4.1"
-PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9a-z]*\).*$/\1/'`
-
 # source function library
 . /etc/rc.d/init.d/functions
 
@@ -22,6 +19,9 @@ if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]; then
     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_DATA="/var/lib/sepgsql/data"
diff --git a/sepostgresql.spec b/sepostgresql.spec
index f48bd42..05ea0e8 100644
--- a/sepostgresql.spec
+++ b/sepostgresql.spec
@@ -8,19 +8,16 @@
 %define selinux_policy_stores targeted mls
 
 %{!?ssl:%define ssl 1}
-%{!?beta:%define beta .beta1}
 
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 9.0.0
-Release: 20100523%{?beta}%{?dist}
+Release: 20101005%{?dist}
 License: PostgreSQL
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-#XXX - to be revert later
-#Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-Source0: postgresql-9.0beta1.tar.gz
+Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
 Source1: sepostgresql.init
 Source2: sepostgresql.8
 Source3: sepostgresql.logrotate
@@ -49,9 +46,7 @@ the operating system. SE-PostgreSQL works as a userspace
 reference monitor to check any SQL query.
 
 %prep
-#XXX - to be revert later
-#%setup -q -n postgresql-%{version}
-%setup -q -n postgresql-9.0beta1
+%setup -q -n postgresql-%{version}
 %patch0 -p1
 %patch1 -p1
 
@@ -186,6 +181,9 @@ fi
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Tue Oct  5 2010 KaiGai Kohei <kaigai at kaigai.gr.jp> - 9.0.0-20101005
+- upgrade base version to 9.0.0
+
 * Tue May 11 2010 KaiGai Kohei <kaigai at kaigai.gr.jp> - 9.0.0-20100511
 - upgrade base version to 9.0beta1