auto-import changelog data from postgresql-7.4-5.src.rpmpostgresql-7_4-5FC-2-split

Fri Dec 05 2003 David Jee <djee@redhat.com> 7.4-5
- Rebuild for Perl 5.8.2.
Mon Dec 01 2003 David Jee <djee@redhat.com> 7.4-4
- Add PyGreSQL patch for deprecated column pg_type.typprtlen [Bug #111263]
- Add headers patch which moves ecpg headers to /usr/include/ecpg [Bug
    #111195]
Fri Nov 28 2003 David Jee <djee@redhat.com> 7.4-3
- uncomment buildrequires tcl-devel
Fri Nov 28 2003 David Jee <djee@redhat.com> 7.4-2
- rebuild
Mon Nov 24 2003 David Jee <djee@redhat.com> 7.4-1
- initial Red Hat build
- move jars to /usr/share/java
- fix rpm-multilib patch to use sysconfig

5 files changed, 840 insertions, 10 deletions

diff --git a/.cvsignore b/.cvsignore
index 0a35bc8..feab2e3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-postgresql-7.3.4-USpdfdocs.tar.gz
-postgresql-7.3.4.tar.gz
+PyGreSQL-3.4-pre021201.tgz
+postgresql-7.4.tar.bz2
diff --git a/README.rpm-dist b/README.rpm-dist
index ce775d3..e230002 100644
--- a/README.rpm-dist
+++ b/README.rpm-dist
@@ -1,6 +1,6 @@
 README.rpm-dist
 -----------------------------------------------------------------------------
-Version 5.0, for the PostgreSQL 7.3-1PGDG RPMset.
+Version 6.0, for the PostgreSQL 7.4-0.1PGDG RPMset.
 Lamar Owen <lamar.owen@wgcr.org> 
 -----------------------------------------------------------------------------
 
@@ -31,7 +31,7 @@ This document exists to explain the layout of the RPM's for PostgreSQL,to
 describe various RPM specifics, and to document special features found
 in the RPMset.
 
-This document is written to be applicable to version 7.3 of PostgreSQL, 
+This document is written to be applicable to version 7.4 of PostgreSQL, 
 which is the current version of the RPM's as of this writing. More to the 
 point, versions prior to 7.3 are not documented here.
 
@@ -54,9 +54,12 @@ documented in the regular documentation.  That is, you must dump, upgrade,
 initdb, and restore your data.  The 7.2 to 7.3 migration can be quite
 difficult, even to the point of requiring hand-editing of the dumpfile.
 
-Thus, the 7.3 postgresql-server RPM specifically conflicts with prior
+Thus, the 7.3 postgresql-server RPM specifically conflicted with prior
 versions.  The old server subpackage must be removed first, the new package
-installed, and the data restored from dump.
+installed, and the data restored from dump.  However, RPM itself did not
+honor this.  A new method of running multiple versions of PostgreSQL, along
+with the capability to run multiple postmasters, is in development, but was
+not ready for this release.
 
 A new section on running multiple postmasters has replaced the old upgrade
 instructions.
@@ -80,6 +83,9 @@ bash, and the home directory set to /var/lib/pgsql.  This user also has no
 default password -- in order to be able to su to from a non-root account
 or login as 'postgres' you will need to set a password using passwd.
 
+While PygreSQL was split out from the main tarball, thanks to Kaj's work it
+is still included as the python subpackage.
+
 CREDITS
 -----------------------------------------------------------------------------
 Thomas Lockhart
@@ -95,6 +101,9 @@ Jeff Johnson
 Reinhard Max
 Peter Eisentraut
 Joe Conway
+Andrew Overholt
+David Jee
+Kaj J. Niemi
 
 POSTGRESQL RPM PACKAGES AND RATIONALE.
 -----------------------------------------------------------------------------
@@ -339,5 +348,7 @@ pgsql-ports@postgresql.org -- please include an [RPM] string in the subject, as
 I use automatic mail folder processing to put mail in the right place.
 
 SuSE information is available at SuSE's website and information contacts.
+A 7.4 SuSE RPM is available on ftp.postgresql.org.  It is different from this
+RPM due to SuSE's different needs.
 -----------------------------------------------------------------------------
 
diff --git a/postgresql.init b/postgresql.init
index b9a236f..08aad37 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -51,8 +51,10 @@
 # VErsion 7.3 Lamar OWen <lamar.owen@ramifordistat.net>
 # Multiple postmasters, courtesy Karl DeBisschop
 
+# VErsion 7.4 Lamar Owen.
+
 # PGVERSION is:
-PGVERSION=7.3
+PGVERSION=7.4
 
 # Source function library.
 INITD=/etc/rc.d/init.d
@@ -101,7 +103,7 @@ start(){
 	then
 	# Check version of existing PGDATA
 
-		if [ `cat $PGDATA/PG_VERSION` != '7.3' ]
+		if [ `cat $PGDATA/PG_VERSION` != '7.4' ]
 		then
 			SYSDOCDIR="(Your System's documentation directory)"
 			if [ -d /usr/doc/postgresql-$PGVERSION ]
diff --git a/postgresql.spec b/postgresql.spec
new file mode 100755
index 0000000..3643c98
--- /dev/null
+++ b/postgresql.spec
@@ -0,0 +1,817 @@
+# build6x usage: define to 1 to build for RHL6.x.  Don't define at all for others.
+%{?build6x:%define kerberos 0}
+%{?build6x:%define nls 0}
+%{?build6x:%define ssl 0}
+%{?build6x:%define aconfver /bin/true}
+#work around the undefined or defined to 1 build 6x interaction with the pam stuff
+%{!?build6x:%define non6xpamdeps 1}
+%{?build6x:%define non6xpamdeps 0}
+#build7x and build89 similar
+%{?build7x:%define kerbdir --with-krb5=/usr/kerberos}
+%{?build89:%define kerbdir --with-krb5=/usr/kerberos}
+%{?build7x:%define aconfver autoconf-2.53}
+
+%{!?kerbdir:%define kerbdir --with-krb5}
+%{!?aconfver:%define aconfver autoconf}
+
+%define beta 0
+
+%{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
+
+%{!?tcl:%define tcl 1}
+%{!?tkpkg:%define tkpkg 0}
+%{!?jdbc:%define jdbc 1}
+%{!?test:%define test 1}
+%{!?python:%define python 1}
+%{!?pltcl:%define pltcl 1}
+%{!?plperl:%define plperl 1}
+%{!?pls:%define pls 1}
+%{!?ssl:%define ssl 1}
+%{!?kerberos:%define kerberos 1}
+%{!?nls:%define nls 1}
+%{!?pam:%define pam 1}
+%{!?pgfts:%define pgfts 1}
+
+# Python major version.
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
+%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')}
+
+
+Summary: PostgreSQL client programs and libraries.
+Name: postgresql
+Version: 7.4
+
+# Conventions for PostgreSQL Global Development Group RPM releases:
+
+# Official PostgreSQL Development Group RPMS have a PGDG after the release number.
+# Integer releases are stable -- 0.1.x releases are Pre-releases, and x.y are
+# test releases.
+
+# Pre-releases are those that are built from CVS snapshots or pre-release
+# tarballs from postgresql.org.  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.
+
+# Test releases are where PostgreSQL itself is not in beta, but certain parts of
+# the RPM packaging (such as the spec file, the initscript, etc) are in beta.
+
+# 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: 5
+License: BSD
+Group: Applications/Databases
+Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
+Source3: postgresql.init
+Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.md5
+Source6: README.rpm-dist
+Source8: http://jdbc.postgresql.org/download/pg73jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg73jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg73jdbc3.jar
+Source11: http://jdbc.postgresql.org/download/devpgjdbc1.jar
+Source12: http://jdbc.postgresql.org/download/devpgjdbc2.jar
+Source13: http://jdbc.postgresql.org/download/devpgjdbc3.jar
+Source15: postgresql-bashprofile
+Source16: filter-requires-perl-Pg.sh
+#Source17: postgresql-7.3.4-USpdfdocs.tar.gz
+Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.4-pre021201.tgz
+Patch1: rpm-pgsql-%{version}.patch
+Patch2: rpm-multilib-%{version}.patch
+Patch3: postgresql-%{version}-tighten.patch
+Patch4: postgresql-ppc64.patch
+Patch5: postgresql-plperl.patch
+Patch6: postgresql-7.4-src-tutorial.patch
+Patch7: postgresql-7.3.4-s390-pic.patch
+Patch8: postgresql-7.4-com_err.patch
+Patch9: PyGreSQL-3.4-pre021201-bugfix.patch
+Patch10: postgresql-7.4-headers.patch
+Buildrequires: perl glibc-devel bison flex
+Prereq: /sbin/ldconfig initscripts
+%if %python
+BuildPrereq: python-devel
+%endif
+%if %tcl
+BuildPrereq: tcl
+Buildrequires: tcl-devel
+%endif
+%if %tkpkg
+BuildPrereq: tk
+%endif
+BuildPrereq: readline-devel
+BuildPrereq: zlib-devel >= 1.0.4
+%if %ssl
+BuildPrereq: openssl-devel
+%endif
+%if %kerberos
+BuildPrereq: krb5-devel
+BuildPrereq: e2fsprogs-devel
+%endif
+%if %nls
+BuildPrereq: gettext >= 0.10.35
+%endif
+
+%if %pam
+%if %non6xpamdeps
+BuildPrereq: pam-devel
+%endif
+%endif
+
+Url: http://www.postgresql.org/ 
+Obsoletes: postgresql-clients
+Obsoletes: postgresql-perl
+Obsoletes: postgresql-tk
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+
+# This is the PostgreSQL Global Development Group Official RPMset spec file,
+# or a derivative thereof.
+# Copyright 2003 Lamar Owen <lowen@pari.edu> <lamar.owen@wgcr.org>
+# and others listed.
+
+# Major Contributors:
+# ---------------
+# Lamar Owen
+# Trond Eivind Glomsrd <teg@redhat.com>
+# Thomas Lockhart
+# Reinhard Max
+# Karl DeBisschop
+# Peter Eisentraut
+# Joe Conway
+# Andrew Overholt
+# David Jee
+# Kaj J. Niemi
+# and others in the Changelog....
+
+# This spec file and ancilliary files are licensed in accordance with 
+# The PostgreSQL license.
+
+# On top of this file you can find the default build package list macros.  These can be overridden by defining
+# on the rpm command line:
+# rpm --define 'packagename 1' .... to force the package to build.
+# rpm --define 'packagename 0' .... to force the package NOT to build.
+# The base package, the lib package, the devel package, and the server package always get built.
+
+
+%description
+PostgreSQL is an advanced Object-Relational database management system
+(DBMS) that supports almost all SQL constructs (including
+transactions, subselects and user-defined types and functions). The
+postgresql package includes the client programs and libraries that
+you'll need to access a PostgreSQL DBMS server.  These PostgreSQL
+client programs are programs that directly manipulate the internal
+structure of PostgreSQL databases on a PostgreSQL server. These client
+programs can be located on the same machine with the PostgreSQL
+server, or may be on a remote machine which accesses a PostgreSQL
+server over a network connection. This package contains the docs
+in HTML for the whole package, as well as command-line utilities for
+managing PostgreSQL databases on a PostgreSQL server. 
+
+If you want to manipulate a PostgreSQL database on a remote PostgreSQL
+server, you need this package. You also need to install this package
+if you're installing the postgresql-server package.
+
+%package libs
+Summary: The shared libraries required for any PostgreSQL clients.
+Group: Applications/Databases
+Provides: libpq.so
+
+%description libs
+The postgresql-libs package provides the essential shared libraries for any 
+PostgreSQL client program or interface. You will need to install this package
+to use any other PostgreSQL package or any clients that need to connect to a
+PostgreSQL server.
+
+%package server
+Summary: The programs needed to create and run a PostgreSQL server.
+Group: Applications/Databases
+Prereq: /usr/sbin/useradd /sbin/chkconfig 
+Requires: postgresql = %{version} libpq.so
+Conflicts: postgresql < 7.3
+
+%description server
+The postgresql-server package includes the programs needed to create
+and run a PostgreSQL server, which will in turn allow you to create
+and maintain PostgreSQL databases.  PostgreSQL is an advanced
+Object-Relational database management system (DBMS) that supports
+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 package.
+
+
+%package docs
+Summary: Extra documentation for PostgreSQL
+Group: Applications/Databases
+%description docs
+The postgresql-docs package includes the SGML source for the documentation
+as well as the documentation in PDF format and some extra documentation.
+Install this package if you want to help with the PostgreSQL documentation
+project, or if you want to generate printed documentation.
+
+%package contrib
+Summary: Contributed source and binaries distributed with PostgreSQL
+Group: Applications/Databases
+Requires: postgresql = %{version}
+%description contrib
+The postgresql-contrib package contains contributed packages that are
+included in the PostgreSQL distribution.
+
+
+%package devel
+Summary: PostgreSQL development header files and libraries.
+Group: Development/Libraries
+Requires: postgresql-libs = %{version}
+
+%description devel
+The postgresql-devel package contains the header files and libraries
+needed to compile C or C++ applications which will directly interact
+with a PostgreSQL database management server and the ecpg Embedded C
+Postgres preprocessor. You need to install this package if you want to
+develop applications which will interact with a PostgreSQL server. If
+you're installing postgresql-server, you need to install this
+package.
+
+#------------
+%if %pls
+%package pl
+Summary: The PL procedural languages for PostgreSQL.
+Group: Applications/Databases
+Requires: postgresql = %{version}
+PreReq: postgresql-server = %{version}
+
+%description pl
+PostgreSQL is an advanced Object-Relational database management
+system.  The postgresql-pl package contains the the PL/Perl, PL/Tcl, and PL/Python
+procedural languages for the backend.  PL/Pgsql is part of the core server package.
+%endif
+
+#------------
+%if %tcl
+%package tcl
+Summary: A Tcl client library for PostgreSQL.
+Group: Applications/Databases
+Requires: tcl >= 8.0
+
+%description tcl
+PostgreSQL is an advanced Object-Relational database management
+system.  The postgresql-tcl package contains the libpgtcl client library,
+the pg-enhanced pgtclsh,and the pg-enhanced tksh, if so configured at buildtime.
+%endif
+
+#------------
+%if %python
+%package python
+Summary: Development module for Python code to access a PostgreSQL DB.
+Group: Applications/Databases
+Requires: python mx
+Conflicts: python < %pyver, python >= %pynextver
+
+
+%description python
+PostgreSQL is an advanced Object-Relational database management
+system.  The postgresql-python package includes a module for
+developers to use when writing Python code for accessing a PostgreSQL
+database.
+%endif
+
+#----------
+%if %jdbc
+%package jdbc
+Summary: Files needed for Java programs to access a PostgreSQL database.
+Group: Applications/Databases
+
+%description jdbc
+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.
+%endif
+
+#------------
+%if %test
+%package test
+Summary: The test suite distributed with PostgreSQL.
+Group: Applications/Databases
+Requires: postgresql = %{version}
+PreReq: postgresql-server = %{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.
+%endif
+
+%define __perl_requires %{SOURCE16}
+
+%prep
+%setup -q 
+pushd doc
+tar zxf postgres.tar.gz
+popd
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+# %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch10 -p1
+
+#call autoconf 2.53 or greater
+%aconfver
+
+pushd doc
+tar -zcf postgres.tar.gz *.html stylesheet.css
+rm -f *.html stylesheet.css
+popd
+
+#cp -p %{SOURCE17} .
+#tar zxf %{SOURCE17}
+
+%if %python
+   tar xzf %{SOURCE18}
+   patch -p0 < %{PATCH9}
+   PYGRESQLDIR=`basename %{SOURCE18} .tgz`
+   mv $PYGRESQLDIR PyGreSQL
+%endif
+
+%build
+
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
+%if %kerberos
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
+%endif
+
+# Strip out -ffast-math from CFLAGS....
+
+CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+export LIBNAME=%{_lib}
+%configure --disable-rpath \
+%if %beta
+	--enable-debug \
+	--enable-cassert \
+%endif
+%if %plperl
+	--with-perl \
+%endif
+%if %tcl
+	--with-tcl \
+	--with-tclconfig=%{_libdir} \
+%endif
+%if %tkpkg
+	--with-tkconfig=%{_libdir} \
+%else
+	--without-tk \
+%endif
+%if %python
+	--with-python \
+%endif
+%if %ssl
+	--with-openssl \
+%endif
+%if %pam
+	--with-pam \
+%endif
+%if %kerberos
+	%kerbdir \
+%endif
+%if %nls
+	--enable-nls \
+%endif
+%if %pgfts
+	--enable-thread-safety \
+%endif
+	--sysconfdir=/etc/sysconfig/pgsql \
+	--datadir=/usr/share/pgsql \
+	--with-docdir=%{_docdir}
+
+make all
+make -C contrib all
+
+%if %test
+	pushd src/test
+	make all
+	popd
+%endif
+
+%if %python
+   PYTHON=/usr/bin/python
+   python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
+   python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
+   python_includespec="-I${python_prefix}/include/python${python_version}"
+
+   pushd PyGreSQL
+
+   gcc $CFLAGS -fpic -shared -o _pgmodule.so ${python_includespec} -I../src/interfaces/libpq -I../src/include -L../src/interfaces/libpq -lpq pgmodule.c
+
+   popd
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+make -C contrib DESTDIR=$RPM_BUILD_ROOT install
+
+# install dev headers.
+
+make DESTDIR=$RPM_BUILD_ROOT install-all-headers
+
+# copy over Makefile.global to the include dir....
+install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
+
+%if %jdbc
+	# Java/JDBC
+	# Red Hat's standard place to put jarfiles is /usr/share/java
+
+	# JDBC jars 
+	install -d $RPM_BUILD_ROOT/usr/share/java
+	install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/share/java
+	install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/usr/share/java
+	install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/usr/share/java
+	install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/share/java
+	install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/usr/share/java
+	install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/usr/share/java
+
+%endif
+
+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
+fi
+
+
+# PGDATA needs removal of group and world permissions due to pg_pwd hole.
+install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/data
+
+# backups of data go here...
+install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
+
+# postgres' .bash_profile
+install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
+
+# Create the multiple postmaster startup directory
+install -d -m 700 $RPM_BUILD_ROOT/etc/sysconfig/pgsql
+
+
+%if %test
+	# tests. There are many files included here that are unnecessary, but include
+	# them anyway for completeness.
+	mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql/test
+	cp -a src/test/regress $RPM_BUILD_ROOT/usr/lib/pgsql/test
+	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
+	pushd  $RPM_BUILD_ROOT/usr/lib/pgsql/test/regress/
+	strip *.so
+	popd
+%endif
+
+# Fix some more documentation
+# gzip doc/internals.ps
+cp %{SOURCE6} README.rpm-dist
+mv $RPM_BUILD_ROOT%{_docdir}/postgresql/html doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/postgresql
+%if %tkpkg
+%else
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pgtksh.*
+%endif
+
+%if %python
+   pushd PyGreSQL
+   install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+   install -m 0755 _pgmodule.so $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+   install -m 0755 pg.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+   install -m 0755 pgdb.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+   popd
+%endif
+
+%find_lang libpq
+%find_lang pg_dump
+%find_lang postgres
+%find_lang psql
+%find_lang pg_resetxlog
+%find_lang pg_controldata
+%find_lang pgscripts
+
+cat libpq.lang > libpq.lst
+cat psql.lang pg_dump.lang pgscripts.lang > main.lst
+cat postgres.lang pg_resetxlog.lang pg_controldata.lang > server.lst
+
+%post libs -p /sbin/ldconfig 
+%postun libs -p /sbin/ldconfig 
+
+%pre server
+groupadd -g 26 -o -r 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/pgsql
+chown postgres.postgres /var/log/pgsql
+chmod 0700 /var/log/pgsql
+
+%post server
+chkconfig --add postgresql
+/sbin/ldconfig
+
+%preun server
+if [ $1 = 0 ] ; then
+	chkconfig --del postgresql
+fi
+
+%postun server
+/sbin/ldconfig 
+if [ $1 -ge 1 ]; then
+  /sbin/service postgresql condrestart >/dev/null 2>&1
+fi
+if [ $1 = 0 ] ; then
+	userdel postgres >/dev/null 2>&1 || :
+	groupdel postgres >/dev/null 2>&1 || : 
+fi
+
+%if %tcl
+%post -p /sbin/ldconfig   tcl
+%postun -p /sbin/ldconfig   tcl
+%endif
+
+%if %pls
+%post -p /sbin/ldconfig   pl
+%postun -p /sbin/ldconfig   pl
+%endif
+
+%if %test
+%post test
+chown -R postgres.postgres /usr/share/pgsql/test >/dev/null 2>&1 || :
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+# FILES section.
+
+%files -f main.lst
+%defattr(-,root,root)
+%doc doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* 
+%doc COPYRIGHT README HISTORY doc/bug.template
+%doc README.rpm-dist
+%doc doc/html
+%{_bindir}/clusterdb
+%{_bindir}/createdb
+%{_bindir}/createlang
+%{_bindir}/createuser
+%{_bindir}/dropdb
+%{_bindir}/droplang
+%{_bindir}/dropuser
+%{_bindir}/pg_dump
+%{_bindir}/pg_dumpall
+%{_bindir}/pg_encoding
+%{_bindir}/pg_id
+%{_bindir}/pg_restore
+%{_bindir}/psql
+%{_bindir}/vacuumdb
+%{_mandir}/man1/clusterdb.*
+%{_mandir}/man1/createdb.*
+%{_mandir}/man1/createlang.*
+%{_mandir}/man1/createuser.*
+%{_mandir}/man1/dropdb.*
+%{_mandir}/man1/droplang.*
+%{_mandir}/man1/dropuser.*
+%{_mandir}/man1/pg_dump.*
+%{_mandir}/man1/pg_dumpall.*
+%{_mandir}/man1/pg_restore.*
+%{_mandir}/man1/psql.*
+%{_mandir}/man1/vacuumdb.*
+%{_mandir}/man7/*
+
+%files docs
+%defattr(-,root,root)
+%doc doc/src/*
+#doc *-US.pdf
+%doc src/tutorial
+
+%files contrib
+%defattr(-,root,root)
+%{_libdir}/pgsql/_int.so
+%{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/btree_gist.so
+%{_libdir}/pgsql/chkpass.so
+%{_libdir}/pgsql/cube.so
+%{_libdir}/pgsql/dblink.so
+%{_libdir}/pgsql/dbsize.so
+%{_libdir}/pgsql/earthdistance.so
+%{_libdir}/pgsql/fti.so
+%{_libdir}/pgsql/fuzzystrmatch.so
+%{_libdir}/pgsql/insert_username.so
+%{_libdir}/pgsql/int_aggregate.so
+%{_libdir}/pgsql/isbn_issn.so
+%{_libdir}/pgsql/lo.so
+%{_libdir}/pgsql/ltree.so
+%{_libdir}/pgsql/misc_utils.so
+%{_libdir}/pgsql/moddatetime.so
+%{_libdir}/pgsql/noup.so
+%{_libdir}/pgsql/pending.so
+%{_libdir}/pgsql/pgcrypto.so
+%{_libdir}/pgsql/pgstattuple.so
+%{_libdir}/pgsql/refint.so
+%{_libdir}/pgsql/rserv.so
+%{_libdir}/pgsql/rtree_gist.so
+%{_libdir}/pgsql/seg.so
+%{_libdir}/pgsql/string_io.so
+%{_libdir}/pgsql/tablefunc.so
+%{_libdir}/pgsql/timetravel.so
+%{_libdir}/pgsql/tsearch.so
+%{_libdir}/pgsql/tsearch2.so
+%{_libdir}/pgsql/user_locks.so
+%{_datadir}/pgsql/contrib/
+%{_bindir}/dbf2pg
+%{_bindir}/findoidjoins
+%{_bindir}/make_oidjoins_check
+%{_bindir}/fti.pl
+%{_bindir}/oid2name
+%{_bindir}/pg_dumplo
+%{_bindir}/pg_logger
+%{_bindir}/pgbench
+%{_bindir}/RservTest
+%{_bindir}/MasterInit
+%{_bindir}/MasterAddTable
+%{_bindir}/Replicate
+%{_bindir}/MasterSync
+%{_bindir}/CleanLog
+%{_bindir}/SlaveInit
+%{_bindir}/SlaveAddTable
+%{_bindir}/GetSyncID
+%{_bindir}/PrepareSnapshot
+%{_bindir}/ApplySnapshot
+%{_bindir}/InitRservTest
+%{_bindir}/vacuumlo
+%{_bindir}/pg_autovacuum
+%doc contrib/*/README.* contrib/spi/*.example
+
+%files libs -f libpq.lang
+%defattr(-,root,root)
+%{_libdir}/libpq.so.*
+%{_libdir}/libecpg.so.*
+%{_libdir}/libpgtypes.so.*
+%{_libdir}/libecpg_compat.so.*
+
+%files server -f server.lst
+%defattr(-,root,root)
+/etc/rc.d/init.d/postgresql
+%dir /etc/sysconfig/pgsql
+%{_bindir}/initdb
+%{_bindir}/initlocation
+%{_bindir}/ipcclean
+%{_bindir}/pg_controldata
+%{_bindir}/pg_ctl
+%{_bindir}/pg_resetxlog
+%{_bindir}/postgres
+%{_bindir}/postmaster
+%{_mandir}/man1/initdb.*
+%{_mandir}/man1/initlocation.*
+%{_mandir}/man1/ipcclean.*
+%{_mandir}/man1/pg_controldata.*
+%{_mandir}/man1/pg_ctl.*
+%{_mandir}/man1/pg_resetxlog.*
+%{_mandir}/man1/postgres.*
+%{_mandir}/man1/postmaster.*
+%{_datadir}/pgsql/postgres.bki
+%{_datadir}/pgsql/postgres.description
+%{_datadir}/pgsql/*.sample
+%{_libdir}/pgsql/plpgsql.so
+%dir %{_libdir}/pgsql
+%dir %{_datadir}/pgsql
+%attr(700,postgres,postgres) %dir /var/lib/pgsql
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/data
+%attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
+%attr(644,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile
+%{_libdir}/pgsql/*_and_*.so
+%{_datadir}/pgsql/conversion_create.sql
+%{_datadir}/pgsql/information_schema.sql
+%{_datadir}/pgsql/sql_features.txt
+
+%files devel
+%defattr(-,root,root)
+/usr/include/*
+%{_bindir}/ecpg
+%{_bindir}/pg_config
+%{_libdir}/libpq.so
+%{_libdir}/libecpg.so
+%{_libdir}/libpq.a
+%{_libdir}/libecpg.a
+%if %tcl
+%{_libdir}/libpgtcl.a
+%endif
+%{_libdir}/libecpg_compat.so
+%{_libdir}/libecpg_compat.a
+%{_libdir}/libpgtypes.so
+%{_libdir}/libpgtypes.a
+%{_mandir}/man1/ecpg.*
+%{_mandir}/man1/pg_config.*
+
+%if %tcl
+%files tcl
+%defattr(-,root,root)
+%attr(755,root,root) %{_libdir}/libpgtcl.so.*
+# libpgtcl.so is not in devel because Tcl scripts may load it by that name.
+%{_libdir}/libpgtcl.so
+%{_bindir}/pgtclsh
+%{_mandir}/man1/pgtclsh.*
+%if %tkpkg
+%{_bindir}/pgtksh
+%{_mandir}/man1/pgtksh.*
+%endif
+%endif
+
+%if %pls
+%files pl
+%defattr(-,root,root)
+%if %plperl
+%{_libdir}/pgsql/plperl.so
+%endif
+%if %pltcl
+%{_libdir}/pgsql/pltcl.so
+%{_bindir}/pltcl_delmod
+%{_bindir}/pltcl_listmod
+%{_bindir}/pltcl_loadmod
+%{_datadir}/pgsql/unknown.pltcl
+%endif
+%{_libdir}/pgsql/plpython.so
+%endif
+
+%if %python
+%files python
+%defattr(-,root,root)
+%doc PyGreSQL/README PyGreSQL/tutorial PyGreSQL/Announce PyGreSQL/ChangeLog
+%{_libdir}/python%{pyver}/site-packages/_pgmodule.so
+%{_libdir}/python%{pyver}/site-packages/*.py
+%endif
+
+%if %jdbc
+%files jdbc
+%defattr(-,root,root)
+%{_datadir}/java/pg73jdbc1.jar
+%{_datadir}/java/pg73jdbc2.jar
+%{_datadir}/java/pg73jdbc3.jar
+%{_datadir}/java/devpgjdbc1.jar
+%{_datadir}/java/devpgjdbc2.jar
+%{_datadir}/java/devpgjdbc3.jar
+%endif
+
+%if %test
+%files test
+%defattr(-,postgres,postgres)
+%attr(-,postgres,postgres) /usr/lib/pgsql/test/*
+%attr(-,postgres,postgres) %dir /usr/lib/pgsql/test
+%endif
+
+%changelog
+* Fri Dec 05 2003 David Jee <djee@redhat.com> 7.4-5
+- Rebuild for Perl 5.8.2.
+
+* Mon Dec 01 2003 David Jee <djee@redhat.com> 7.4-4
+- Add PyGreSQL patch for deprecated column pg_type.typprtlen [Bug #111263]
+- Add headers patch which moves ecpg headers to /usr/include/ecpg
+  [Bug #111195]
+
+* Fri Nov 28 2003 David Jee <djee@redhat.com> 7.4-3
+- uncomment buildrequires tcl-devel
+
+* Fri Nov 28 2003 David Jee <djee@redhat.com> 7.4-2
+- rebuild
+
+* Mon Nov 24 2003 David Jee <djee@redhat.com> 7.4-1
+- initial Red Hat build
+- move jars to /usr/share/java
+- fix rpm-multilib patch to use sysconfig
+
+* Fri Nov 21 2003 Lamar Owen <lowen@pari.edu> <lamar.owen@wgcr.org>
+- 7.4-0.1PGDG
+- Development JDBC jars in addition to the 7.3 jars; will replace the
+- 7.3 jars once 7.4 official jars are released.
+- Changed to use the bzip2 source to save a little size.
+- Removed some commented out portions of the specfile.
+- Removed the 7.3.4 PDF docs.  Will replace with 7.4 PDF's once they
+- are ready.
+
+* Tue Nov 18 2003 Kaj J. Niemi <kajtzu@fi.basen.net> 7.4-0.1
+- 7.4
+- Fixed Patch #1 (now rpm-pgsql-7.4.patch)
+- Fixed Patch #2 (now rpm-multilib-7.4.patch):
+- Patch #4 is unnecessary (upstream)
+- Fixed Patch #6 (now postgresql-7.4-src-tutorial.patch)
+- Added Patch #8 (postgresql-7.4-com_err.patch) as com_err()
+  is provided by e2fsprogs and CPPFLAGS gets lost somewhere
+  inside configure (bad macro?)
+- No 7.4 PDF docs available yet (Source #17)
+- PyGreSQL is separated from the upstream distribution but
+  we include it as usual (Source #18)
+- Default to compiling libpq and ECPG as fully thread-safe
+
+- 7.4 Origin.  See previous spec files for previous history. Adapted
+- from Red Hat and PGDG's 7.3.4 RPM, directly descended from 
+- postgresql-7.3.4-2 as shipped in Fedora Core 1.
diff --git a/sources b/sources
index bc1f649..6bb80f6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2460b3c3fe5dadba3488e77419f975b5  postgresql-7.3.4-USpdfdocs.tar.gz
-82878d6d74c36384af3595d26ed38067  postgresql-7.3.4.tar.gz
+8448fa076c1c3724706dfa93f24efc51  PyGreSQL-3.4-pre021201.tgz
+9db7432c431d1570b1f605727daf27bc  postgresql-7.4.tar.bz2