Update to Postgres 7.4.6 (bugs 136947, 136949)

.cvsignore

@@ -1,2 +1,2 @@
 PyGreSQL-3.5.tgz
-postgresql-7.4.5.tar.bz2
+postgresql-7.4.6.tar.bz2

postgresql.init

@@ -160,9 +160,9 @@ start(){
 
 	else
 	        echo -n $"Initializing database: "
-                if [ ! -d $PGDATA ]
+                if [ ! -e $PGDATA -a ! -h $PGDATA ]
 		then
-			mkdir -p $PGDATA
+			mkdir -p $PGDATA || exit 1
 			chown postgres:postgres $PGDATA
 			chmod go-rwx $PGDATA
 		fi

postgresql.spec

@@ -45,7 +45,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 7.4.5
+Version: 7.4.6
 
 # Conventions for PostgreSQL Global Development Group RPM releases:
 
@@ -67,7 +67,7 @@ Version: 7.4.5
 # Pre-release RPM's should not be put up on the public ftp.postgresql.org server
 # -- only test releases or full releases should be.
 
-Release: 4
+Release: 1
 License: BSD
 Group: Applications/Databases
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -788,6 +788,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Oct 23 2004 Tom Lane <tgl@redhat.com> 7.4.6-1
+- Update to PostgreSQL 7.4.6 (bugs 136947, 136949)
+- Make init script more paranoid about mkdir step of initializing a new
+  database (bugs 136947, 136949)
+
 * Wed Oct 20 2004 Tom Lane <tgl@redhat.com> 7.4.5-4
 - Remove contrib/oidjoins stuff from installed fileset; it's of no use
   to ordinary users and has a security issue (bugs 136300, 136301)

sources

@@ -1,2 +1,2 @@
 aec4cc8600af25b1fe895f2ee6cd9801  PyGreSQL-3.5.tgz
-97e750c8e69c208b75b6efedc5a36efb  postgresql-7.4.5.tar.bz2
+f0ea2b372a7bdaf2613e92176ebf5e0f  postgresql-7.4.6.tar.bz2