auto-import postgresql-7.0.3-0.4 from postgresql-7.0.3-0.4.src.rpmpostgresql-7_0_3-0_4RHL-7_0-split

3 files changed, 224 insertions, 67 deletions

diff --git a/.cvsignore b/.cvsignore
index 38b58e0..90dcc67 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,5 @@
-pg-migration-scripts-7.0.2.tar.gz
-postgresql-7.0.2-alpha.patch.gz
-postgresql-7.0.2.tar.gz
+file-lists-pgsql-7.0.3.tar.gz
+pg-migration-scripts-7.0.3.tar.gz
+postgresql-7.0.3-alpha.patch.gz
+postgresql-7.0.3.tar.gz
 postgresql-dump.1.gz
diff --git a/postgresql.spec b/postgresql.spec
index 1ba1621..2bbf166 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,15 +1,16 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 7.0.2
-Release: 19
+Version: 7.0.3
+Release: 0.4
 License: BSD
 Group: Applications/Databases
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
 Source1: http://www.retep.org.uk/postgres/jdbc6.5-1.1.jar
 Source2: http://www.retep.org.uk/postgres/jdbc6.5-1.2.jar
 Source3: postgresql.init-%{version}
-Source6: README.rpm.postgresql-%{version}
+Source4: file-lists-pgsql-%{version}.tar.gz
 Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz.md5
+Source6: README.rpm-dist.postgresql-%{version}
 Source7: pg-migration-scripts-%{version}.tar.gz
 Source8: logrotate.postgresql-%{version}
 Source9: pg_options-%{version}
@@ -19,13 +20,27 @@ Source12: postgresql-dump.1.gz
 Source14: rh-pgdump.sh
 Patch0: postgresql-%{version}-alpha.patch.gz
 Patch1: rpm-pgsql-%{version}.patch
+Patch2: postgresql-7.0.3-ia64-2.patch
 Requires: perl
-Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd /lib/cpp initscripts
-BuildPrereq: python-devel perl tcl
+Prereq: /sbin/chkconfig /sbin/ldconfig /usr/sbin/useradd initscripts
+BuildPrereq: python-devel perl tcl /lib/cpp
 Url: http://www.postgresql.org/ 
-Obsoletes: postgresql-clients postgresql-test
+Obsoletes: postgresql-clients
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-ExcludeArch: ia64
+
+
+# This is the PostgreSQL Global Development Group Official RPMset spec file.
+# Copyright 2000 Lamar Owen <lamar@postgresql.org> <lamar.owen@wgcr.org>
+# and others listed.
+
+# Major Contributors:
+# ---------------
+# Lamar Owen
+# Trond Eivind Glomsrød <teg@redhat.com>
+# Thomas Lockhart
+
+# This spec file and ancilliary files are licensed in accordance with 
+# The PostgreSQL license.
 
 %description
 PostgreSQL is an advanced Object-Relational database management system
@@ -60,7 +75,7 @@ almost all SQL constructs (including transactions, subselects and
 user-defined types and functions). You should install
 postgresql-server if you want to create and maintain your own
 PostgreSQL databases and/or your own PostgreSQL server. You also need
-to install the postgresql and postgresql-devel packages.
+to install the postgresql package.
 
 %package devel
 Summary: PostgreSQL development header files and libraries.
@@ -140,16 +155,16 @@ PostgreSQL is an advanced Object-Relational database management
 system. The postgresql-jdbc package includes the .jar file needed for
 Java programs to access a PostgreSQL database.
 
-#package test
-#Summary: The test suite distributed with PostgreSQL.
-#Group: Applications/Databases
-#Requires: postgresql = %{version}
+%package test
+Summary: The test suite distributed with PostgreSQL.
+Group: Applications/Databases
+Requires: postgresql = %{version}
 
-#description test
-#PostgreSQL is an advanced Object-Relational database management
-#system. The postgresql-test package includes the sources and pre-built
-#binaries of various tests for the PostgreSQL database management
-#system, including regression tests and benchmarks.
+%description test
+PostgreSQL is an advanced Object-Relational database management
+system. The postgresql-test package includes the sources and pre-built
+binaries of various tests for the PostgreSQL database management
+system, including regression tests and benchmarks.
 
 %prep
 %setup -q 
@@ -162,25 +177,41 @@ Java programs to access a PostgreSQL database.
 
 %patch1 -p1
 
+%ifarch ia64
+%patch2 -p1
+%endif
+
+
+# I hope this works....
+
+%ifarch ia64
+ln -s linux_i386 src/template/linux
+%endif
+
 %build
+
+# Get file lists....
+tar xzf %{SOURCE4}
+
+
 pushd src
 
-cp /usr/share/libtool/config.* .
+# If libtool installed, copy some files....
+if [ -d /usr/share/libtool ]
+then
+	cp /usr/share/libtool/config.* .
+fi
+
 CFLAGS="$RPM_OPT_FLAGS"
-%ifarch alpha
-	./configure --enable-hba --enable-locale --prefix=/usr\
-	--with-perl --enable-multibyte\
-	--with-tcl --with-tk --with-x \
-	--with-odbc --with-java \
-	--with-python --with-template=linux_alpha
-%else
 
 ./configure --enable-hba --enable-locale  --prefix=/usr\
 	--with-perl --enable-multibyte \
 	--with-tcl --with-tk --with-x \
-	--with-odbc --with-java \
-	--with-python
+	--with-odbc --with-java --enable-syslog\
+%ifarch alpha
+	--with-template=linux_alpha \
 %endif
+	--with-python 
 
 make COPT="$RPM_OPT_FLAGS" all
 
@@ -205,7 +236,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/{include/pgsql,lib,bin}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}
 mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{_arch}-linux/auto/Pg
 make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src install
-#make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/man install
 make POSTGRESDIR=$RPM_BUILD_ROOT/usr PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 install
 
 # Get rid of the packing list generated by the perl Makefile, and build my own...
@@ -215,9 +245,17 @@ find $RPM_BUILD_ROOT/usr/lib/perl5 -type f -print | \
 	sed -e "s|.*/man/.*|&\*|" > perlfiles.list
 find $RPM_BUILD_ROOT/usr/lib/perl5 -type d -name Pg -print | \
 	sed -e "s|$RPM_BUILD_ROOT/|%dir /|g" >> perlfiles.list
+
+# check and fixup Pg manpage location....
+if [ ! -e $RPM_BUILD_ROOT%{_mandir}/man3/Pg.* ]
+then
+	mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
+	cp `find $RPM_BUILD_ROOT -name 'Pg.3*' -print` $RPM_BUILD_ROOT%{_mandir}/man3
+fi
+
 make -C doc
-#make -C doc man
-# Newer man pages from Thomas Lockhart
+
+# man pages....
 pushd $RPM_BUILD_ROOT%{_mandir}
 tar xzf $RPM_BUILD_DIR/postgresql-%{version}/doc/man.tar.gz
 
@@ -282,8 +320,6 @@ pushd src/interfaces/python
 popd
 
 # Java/JDBC
-# We know that JDK1.2 is pre-beta at this time, so install the JDK1.1-compatible driver
-# as well as the JDK1.2 compatible driver.
 # The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
 # Install 6.5 JDBC jars for now.
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/pgsql
@@ -292,10 +328,28 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/pgsql
 install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/pgsql
 install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/lib/pgsql
 
+# Fixup more permissions...
 chmod 644 $RPM_BUILD_ROOT%{_mandir}/*/*
 chmod +x $RPM_BUILD_ROOT/usr/lib/lib*.so.*
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+
+# The initscripts....
+# Redhat-style....
+if [ -d /etc/rc.d/init.d ]
+then
+	install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+	install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
+	mv redhat-style-files.lst files.lst
+fi
+
+# SuSE-style....
+# NOTE: SuSE stuff not yet fully implemented -- this is likely to not work yet.
+# Putting SuSE-style stuff here
+if [ -d /sbin/init.d ]
+then
+	# install the SuSE stuff...
+	mv suse-style-files.lst files.lst
+fi
+
 
 # Move the PL's to the right place
 mv $RPM_BUILD_ROOT/usr/lib/pl*.so $RPM_BUILD_ROOT/usr/lib/pgsql
@@ -309,14 +363,13 @@ install -m 700 %{SOURCE9} $RPM_BUILD_ROOT/var/lib/pgsql/data/pg_options
 # backups of data go here...
 install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
 
-
 # tests. There are many files included here that are unnecessary, but include
 # them anyway for completeness.
-
-#cp -a src/test $RPM_BUILD_ROOT/usr/lib/pgsql
-#install -m 0755 src/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
-#install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
-#install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
+cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
+install -m 0755 src/config.guess $RPM_BUILD_ROOT/usr/lib/pgsql
+install -m 0755 contrib/spi/refint.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
+install -m 0755 contrib/spi/autoinc.so $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress
 
 # Upgrade scripts.
 pushd $RPM_BUILD_ROOT
@@ -326,14 +379,14 @@ popd
 #logrotate script source (which needs WORK)
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 cp %{SOURCE8} $RPM_BUILD_ROOT/etc/logrotate.d/postgres
-chmod 0700 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
+chmod 0644 $RPM_BUILD_ROOT/etc/logrotate.d/postgres
 
 
 # Fix some more documentation
 # no need for the OS2 client
 rm -rf contrib/os2client
 gzip doc/internals.ps
-cp %{SOURCE6} README.rpm
+cp %{SOURCE6} README.rpm-dist
 
 # remove the binaries from contrib
 
@@ -349,6 +402,13 @@ ln -sf port/linux.h $RPM_BUILD_ROOT/usr/include/pgsql/os.h
 
 perl -pi -e "s/^.*perllocal.pod$//" perlfiles.list
 
+# Symlink libpq.so.2.0 to libpq.so.2.1 for backwards compatibility, until 
+# -soname patches are the norm.
+pushd $RPM_BUILD_ROOT/usr/lib
+ln -s libpq.so.2.1 libpq.so.2.0
+popd
+
+
 %pre
 # Need to make backups of some executables if an upgrade
 # They will be needed to do a dump of the old version's database.
@@ -369,13 +429,18 @@ fi
 %postun -p /sbin/ldconfig 
 
 %pre server
-useradd -M -o -r -d /var/lib/pgsql -s /bin/bash \
+groupadd -g 26 postgres >/dev/null 2>&1 || :
+useradd -M -n -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
 	-c "PostgreSQL Server" -u 26 postgres >/dev/null 2>&1 || :
 touch /var/log/postgresql
 chown postgres.postgres /var/log/postgresql
 chmod 0700 /var/log/postgresql
 
+
 %post -p /sbin/ldconfig  server
+echo PGLIB=/usr/lib/pgsql >> ~postgres/.bash_profile
+echo PGDATA=/var/lib/pgsql/data >> ~postgres/.bash_profile
+echo export PGLIB PGDATA >> ~postgres/.bash_profile
 
 %preun server
 if [ $1 = 0 ] ; then
@@ -388,7 +453,8 @@ if [ $1 -ge 1 ]; then
   /sbin/service postgresql condrestart >/dev/null 2>&1
 fi
 if [ $1 = 0 ] ; then
-	userdel postgres >/dev/null 2>&1 || : 
+	userdel postgres >/dev/null 2>&1 || :
+	groupdel postgres >/dev/null 2>&1 || : 
 fi
 
 %post -p /sbin/ldconfig  odbc
@@ -397,20 +463,29 @@ fi
 %post -p /sbin/ldconfig   tcl
 %postun -p /sbin/ldconfig   tcl
 
+%post test
+chown -R postgres.postgres /usr/lib/pgsql/test >/dev/null 2>&1 || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -f perlfiles.list
 
+# Ok, we are dynamically generating some filelists.  These are by default
+# under the BUILD/postgresql-x.y.z tree.
+
+# Note that macros such as config are available in those lists.
+# The lists differentiate between RedHat, SuSE, and others.
+
 %files
 %defattr(-,root,root)
 %doc doc/FAQ doc/FAQ_Linux doc/README* 
 %doc COPYRIGHT README HISTORY doc/bug.template doc/FAQ_Linux
 %doc contrib doc/unpacked/* 
-%doc README.rpm
-/usr/lib/libpq.so.*
-/usr/lib/libecpg.so.*
-/usr/lib/libpq++.so.*
-/usr/lib/libpgeasy.so.*
+%doc README.rpm-dist
+/usr/lib/libpq.so*
+/usr/lib/libecpg.so*
+/usr/lib/libpq++.so*
+/usr/lib/libpgeasy.so*
 /usr/bin/createdb
 /usr/bin/createlang
 /usr/bin/createuser
@@ -433,9 +508,8 @@ rm -f perlfiles.list
 %{_mandir}/man1/psql.1*
 %{_mandir}/manl/*
 
-%files server
+%files server -f files.lst
 %defattr(-,root,root)
-%config /etc/rc.d/init.d/postgresql
 /etc/logrotate.d/postgres
 /usr/bin/initdb
 /usr/bin/initlocation
@@ -449,7 +523,6 @@ rm -f perlfiles.list
 /usr/bin/postgresql-dump
 /usr/bin/postmaster
 /usr/bin/rh-pgdump.sh
-
 %{_mandir}/man1/initdb.1*
 %{_mandir}/man1/initlocation.1*
 %{_mandir}/man1/ipcclean.1*
@@ -478,10 +551,6 @@ rm -f perlfiles.list
 /usr/include/pgsql
 /usr/bin/ecpg
 /usr/lib/lib*.a
-/usr/lib/libpq.so
-/usr/lib/libecpg.so
-/usr/lib/libpq++.so
-/usr/lib/libpgeasy.so
 %{_mandir}/man1/ecpg.1*
 
 %files tcl
@@ -524,12 +593,98 @@ rm -f perlfiles.list
 /usr/lib/pgsql/jdbc7.0-1.1.jar
 /usr/lib/pgsql/jdbc7.0-1.2.jar
 
-#files test
-#defattr(-,postgres,postgres)
-#attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
-#/usr/lib/pgsql/test/*
-
+%files test
+%defattr(-,postgres,postgres)
+%attr(755,postgres,postgres)/usr/lib/pgsql/config.guess
+%attr(-,postgres,postgres)/usr/lib/pgsql/test/regress/*
+
+# Conventions for PostgreSQL RPM releases:
+# Pre-releases are those that are built from CVS snapshots or pre-release
+# tarballs from postgresql.org.  Pre-releases should have a fractional release
+# number to show their pre-release status.  Official beta releases are not 
+# considered pre-releases, nor are release candidates, as their beta or
+# release candidate status is reflected in the version of the tarball. Pre-
+# releases' versions do not change -- the pre-release tarball of 7.0.3, for
+# example, has the same tarball version as the final official release of 7.0.3:
+# but the tarball is different.
+
+# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
+# -- only full integer releases should be.
+
+# Start changelog proper below this comment
 %changelog
+* Wed Nov 15 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- move /lib/cpp from Prereq to BuildPrereq
+
+* Tue Nov 14 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- made a template for IA64 (symlink to i386)
+
+* Mon Nov 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- add patch for IA64 (I got one from Lamar and modified it)
+
+* Mon Nov 13 2000 Lamar Owen <lamar@postgresql.org>
+- RELEASE: 7.0.3-1
+- Minor edits to initscript.
+- PRE-RELEASE: 7.0.3-0.6 (final test)
+- Final 7.0.3 tarball.
+- Cross-dist changes to RedHat initscript for better portability.
+- changed README.rpm name to README.rpm-dist (the .rpm extension confused
+--some GUI file managers, as RealPlayer also uses that extension).
+- Edited README.rpm-dist to reflect cross-distribution packaging.
+- NOTE: SuSE cross-compatibility is not yet complete  SuSE RPM's for 7.0.3
+--that are tailored for SuSE will be made available.
+- Fixed stupid dependency -- the main .so's were in the devel package (Arggh)
+
+* Sat Nov 11 2000 Lamar Owen <lamar@postgresql.org>
+- PRE-RELEASE: 7.0.3-0.5
+- Framework for better distribution-independent build
+- Conditional around libtool conf stuff copy (For RedHat 6.1 and such).
+- Conditional around RedHat-style initscript stuff.
+- Comments at top of spec file now list copyright and license for spec file,
+--as the license and copyright for the spec file itself has not previously
+--been stated.
+- Envvars for postgres home dir login in .bash_profile.
+- initscript now checks for success and failure functions using:
+--typeset -f|grep "declare -f function_name" construct.
+
+* Fri Nov 10 2000 Lamar Owen <lamar@postgresql.org>
+- PRE-RELEASE: 7.0.3-0.4
+- Directory ownership on /usr/lib/pgsql/test/regress was root.root.
+- Patch Makefile.shlib to not use -soname for RPM's.
+- Newer prerelease 7.0.3 tarball.
+
+* Thu Nov 09 2000 Lamar Owen <lamar@postgresql.org>
+- PRE-RELEASE: 7.0.3-0.3
+- Don't bother copying the test stuff I'm not packaging.
+- Fix group add/del stuff in server subpackage post and postun scriptlets.
+- symlink /usr/lib/libpq.so.2.0 -> libpq.so.2.1
+
+* Mon Nov 06 2000 Lamar Owen <lamar@postgresql.org>
+- PRE-RELEASE: 7.0.3-0.2
+- preliminary 7.0.3 distribution tarball -- reinstated man pages, etc.
+
+* Sat Nov 04 2000 Lamar Owen <lamar@postgresql.org>
+- PRE-RELEASE: 7.0.3-0.1.
+- Improved test subpackage -- only package regression.
+- Latest pre-7.0.3 snapshot.
+- Split out SuSE and Caldera spec files.  Caldera COL eServer 2.3 requires
+-- RPM 2.5.5-compatible spec files.  SuSE is just too different from the others
+-- for the spec file to cope, for now.
+- TODO: man pages and documentation.
+
+* Mon Oct 30 2000 Lamar Owen <lamar@postgresql.org>
+- pre-7.0.3
+
+* Mon Oct 30 2000 Lamar Owen <lamar@postgresql.org>
+- Reenabled the test subpackage for ftp.postgresql.org dist.
+- Backported to RH 6.2 -- involved the Pg man page, doesn't appear to require
+-- other stuff to be done.
+
+
+* Sun Oct 22 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- make /etc/logrotate.d/postgres 0644 instead of 0700 (#19520)
+
+
 * Thu Oct 19 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - rebuild with new glibc which has semaphore fixes for Alpha 
 
diff --git a/sources b/sources
index 5d6e592..4321e13 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
-baae3796a93a2aaac512cc05abfebc89  pg-migration-scripts-7.0.2.tar.gz
-c139d0716a459622c463bab8c438e3cc  postgresql-7.0.2-alpha.patch.gz
-fc512e38394256e2749299fdd69a937e  postgresql-7.0.2.tar.gz
+57d69fb52be57f7caa91cccf7d24d199  file-lists-pgsql-7.0.3.tar.gz
+baae3796a93a2aaac512cc05abfebc89  pg-migration-scripts-7.0.3.tar.gz
+c139d0716a459622c463bab8c438e3cc  postgresql-7.0.3-alpha.patch.gz
+b416c04e6c91967160dfde866293ee6f  postgresql-7.0.3.tar.gz
 3d2e8223f6bb715659cbecedeae81ccc  postgresql-dump.1.gz