packages: postgresql/postgresql.spec - rel 1; fail in pre and not in pretra...

[arekm]

Author: arekm                        Date: Sat Oct  2 19:23:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1; fail in pre and not in pretrans since pretrans failure doesn't stop entire transaction

---- Files affected:
packages/postgresql:
   postgresql.spec (1.455 -> 1.456) 

---- Diffs:

================================================================
Index: packages/postgresql/postgresql.spec
diff -u packages/postgresql/postgresql.spec:1.455 packages/postgresql/postgresql.spec:1.456
--- packages/postgresql/postgresql.spec:1.455	Thu Sep 30 10:20:58 2010
+++ packages/postgresql/postgresql.spec	Sat Oct  2 21:23:41 2010
@@ -29,7 +29,7 @@
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql
 Version:	%{mver}.0
-Release:	0.1
+Release:	1
 License:	BSD
 Group:		Applications/Databases
 Source0:	ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
@@ -891,7 +891,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pretrans
+%pre
 PG_DB_CLUSTERS=""
 if [ -f /etc/sysconfig/postgresql ]; then
 	. /etc/sysconfig/postgresql
@@ -917,7 +917,7 @@
 	echo
 	echo "Warning for upgrade from version *before* 7.2."
 	echo "Please note, that postgresql module path changed from"
-	echo "/usr/lib/pgsql/module to /usr/lib/postgresql. Change the path"
+	echo "%{_libdir}/pgsql/module to %{_libdir}/postgresql. Change the path"
 	echo "in dump file before restore."
 	echo
 	echo "Warning for upgrade from version *before* 7.3."
@@ -925,8 +925,6 @@
 	echo "http://www.ca.postgresql.org/docs/momjian/upgrade_tips_7.3"
 	exit 1
 fi
-
-%pre
 %groupadd -g 88 -r postgres
 %useradd -M -o -r -u 88 -d /home/services/postgres -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
@@ -1247,6 +1245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.456  2010/10/02 19:23:41  arekm
+- rel 1; fail in pre and not in pretrans since pretrans failure doesn't stop entire transaction
+
 Revision 1.455  2010/09/30 08:20:58  arekm
 - fix build without perl by enleth enleth.com
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/postgresql.spec?r1=1.455&r2=1.456&f=u