--- postgresql.spec.prev	Mon Sep 24 00:18:24 2001
+++ postgresql.spec	Mon Sep 24 22:25:30 2001
@@ -15,14 +15,13 @@
 # Utility feature defines.
 %{!?enable_mb:%define enable_mb 1}
 %{!?pgaccess:%define pgaccess 1}
-%{!?newintarray:%define newintarray 0}
 
 # Python major version.
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 7.1.3
+Version: 7.2devel
 
 # Conventions for PostgreSQL Global Development Group RPM releases:
 
@@ -44,7 +43,7 @@
 # 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: 3XXX
+Release: 1pe
 License: BSD
 Group: Applications/Databases
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -58,10 +57,7 @@
 Source12: postgresql-dump.1.gz
 Source14: rh-pgdump.sh
 Source15: postgresql-bashprofile
-Source16: http://www.sai.msu.su/~megera/postgres/gist/code/7.1.2/contrib-intarray.tar.gz
-Patch1: rpm-pgsql-7.1.patch
-Patch2: %{name}-7.1.plperl.patch
-Patch3: %{name}-7.1.s390x.patch
+Patch1: rpm-pgsql-7.2.patch
 Buildrequires: perl glibc-devel
 Prereq: /sbin/ldconfig initscripts
 BuildPrereq: python-devel perl tcl
@@ -149,7 +145,7 @@
 %package libs
 Summary: The shared libraries required for any PostgreSQL clients.
 Group: Applications/Databases
-Provides: libpq.so.2.1 libpq.so.2.0 libpq.so
+Provides: libpq.so.2 libpq.so.2.0 libpq.so
 
 %description libs
 The postgresql-libs package provides the essential shared libraries for any 
@@ -318,30 +314,6 @@
 
 %patch1 -p1
 
-#PL/Perl stuff
-%patch2 -p1
-%patch3 -p1
-
-%if %forceplperl
-FORCEPLPERL=--force
-%else
-FORCEPLPERL=
-%endif
-
-%if %plperl
-        pushd src/pl/plperl
-        EXTRA_INCLUDES=-I../../include plperl_installdir=$RPM_BUILD_ROOT/usr/lib perl Makefile.PL $FORCEPLPERL
-        popd
-%endif
-#
-
-# Newer, optional intarray in contrib.
-%if %newintarray
-	pushd contrib
-	rm -fr intarray
-	tar xvzf %{SOURCE16}
-	popd
-%endif
 
 %build
 
@@ -392,29 +364,11 @@
 	--sysconfdir=/etc/pgsql \
 	--mandir=%{_mandir} \
 	--docdir=%{_docdir} \
-	--includedir=%{_includedir}/pgsql \
+	--includedir=%{_includedir} \
 	--datadir=/usr/share/pgsql
 
 make all
 
-%if %plperl
-        pushd src/pl/plperl
-  make INC=-I../../include
-        popd
-%endif
-
-%if %python
-	pushd src
-	pushd interfaces/python
-	cp /usr/lib/python%{pyver}/config/Makefile.pre.in .
-	echo *shared* > Setup
-	echo _pg pgmodule.c -I../../include -I../libpq -L../libpq -lpq -lcrypt >> Setup
-	make -f Makefile.pre.in boot
-	make
-	popd
-	popd
-%endif
-
 %if %test
 	pushd src/test
 	make all
@@ -426,11 +380,6 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-%if %plperl
-make DESTDIR=$RPM_BUILD_ROOT -C src/pl/plperl install
-#cp blib/arch/auto/plperl/plperl.so $RPM_BUILD_ROOT/usr/lib
-%endif
-
 %if %perl
 	make PREFIX=$RPM_BUILD_ROOT/usr -C src/interfaces/perl5 -f Makefile install
 
@@ -476,13 +425,6 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install-all-headers
 
-#fixup directory permissions for SPI stuff...
-#pushd $RPM_BUILD_ROOT/usr/include/pgsql
-#chmod 755 access catalog executor nodes rewrite storage tcop utils
-#popd
-
-#popd
-
 # copy over Makefile.global to the include dir....
 install -m755 src/Makefile.global $RPM_BUILD_ROOT/usr/include/pgsql
 
@@ -498,15 +440,6 @@
 	popd
 %endif
 
-%if %python
-	# Python
-	pushd src/interfaces/python
-	# Makefile.pre.in doesn't yet support .py files anyway, so we stick to a manual installation
-	  mkdir -p $RPM_BUILD_ROOT/usr/lib/python%{pyver}/site-packages
-	  install -m 755 _pgmodule.so *.py $RPM_BUILD_ROOT/usr/lib/python%{pyver}/site-packages/
-	popd
-%endif
-
 %if %jdbc
 	# Java/JDBC
 	# The user will have to set a CLASSPATH to find it here, but not sure where else to put it...
@@ -517,9 +450,6 @@
 
 %endif
 
-# Fixup more permissions...
-chmod 644 $RPM_BUILD_ROOT%{_mandir}/*/*
-
 # The initscripts....
 # Redhat-style....
 if [ -d /etc/rc.d/init.d ]
@@ -545,10 +475,6 @@
 # backups of data go here...
 install -d -m 700 $RPM_BUILD_ROOT/var/lib/pgsql/backups
 
-# Move the PL's to the right place
-mkdir -p $RPM_BUILD_ROOT/usr/lib/pgsql
-mv $RPM_BUILD_ROOT/usr/lib/pl*.so $RPM_BUILD_ROOT/usr/lib/pgsql
-
 # postgres' .bash_profile
 install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/var/lib/pgsql/.bash_profile
 
@@ -660,11 +586,6 @@
 perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/seg|" *.sql
 popd
 
-# soundex
-pushd soundex
-perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/soundex|" *.sql
-popd
-
 # spi
 pushd spi
 perl -pi -e "s|/usr/lib/contrib|/usr/lib/pgsql/contrib/spi|" *.sql
@@ -687,10 +608,10 @@
 cp src/backend/utils/hash/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c
 ln $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_resetxlog/pg_crc.c $RPM_BUILD_ROOT/usr/lib/pgsql/contrib/pg_controldata/pg_crc.c
 
-# Symlink libpq.so.2.0 to libpq.so.2.1 for backwards compatibility, until 
+# Symlink libpq.so.2.0 to libpq.so.2 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
+ln -s libpq.so.2 libpq.so.2.0
 popd
 
 
@@ -800,8 +721,7 @@
 %{_mandir}/man1/pg_dumpall.1*
 %{_mandir}/man1/psql.1*
 %{_mandir}/man1/vacuumdb.1*
-%{_mandir}/manl/*
-%dir %{_mandir}/manl/
+%{_mandir}/man7/*
 
 %files docs
 %defattr(-,root,root)
@@ -838,10 +758,8 @@
 %{_mandir}/man1/postgres.1*
 %{_mandir}/man1/postmaster.1*
 %{_mandir}/man1/postgresql-dump.1*
-/usr/share/pgsql/global.bki
-/usr/share/pgsql/global.description
-/usr/share/pgsql/template1.bki
-/usr/share/pgsql/template1.description
+/usr/share/pgsql/postgres.bki
+/usr/share/pgsql/postgres.description
 /usr/share/pgsql/*.sample
 /usr/lib/pgsql/plpgsql.so
 %dir /usr/lib/pgsql
@@ -855,8 +773,7 @@
 
 %files devel
 %defattr(-,root,root)
-/usr/include/pgsql/*
-%dir /usr/include/pgsql
+/usr/include/*
 /usr/bin/ecpg
 /usr/bin/pg_config
 /usr/lib/libpq.so
@@ -898,7 +815,6 @@
 %files odbc
 %defattr(-,root,root)
 %attr(755,root,root) /usr/lib/libpsqlodbc.so
-%config(noreplace) /etc/pgsql/odbcinst.ini
 /usr/share/pgsql/odbc.sql
 %endif