211d77bae40f1c72f1153f1cdd50ed78 postgresql-rpm.patch

Changed files:
    postgresql-rpm.patch -> 1.1

diff --git a/postgresql-rpm.patch b/postgresql-rpm.patch
new file mode 100644 (file)
index 0000000..e733fc1
--- /dev/null
+++ b/postgresql-rpm.patch
@@ -0,0 +1,146 @@
+diff -uNr postgresql-7.2devel.orig/src/Makefile.global.in postgresql-7.2devel/src/Makefile.global.in\r
+--- postgresql-7.2devel.orig/src/Makefile.global.in    Sun Sep 16 18:11:09 2001\r
++++ postgresql-7.2devel/src/Makefile.global.in Mon Sep 17 02:08:29 2001\r
+@@ -83,7 +83,7 @@\r
+ pkglibdir = $(libdir)\r
+ ifeq "$(findstring pgsql, $(pkglibdir))" ""\r
+ ifeq "$(findstring postgres, $(pkglibdir))" ""\r
+-override pkglibdir := $(pkglibdir)/postgresql\r
++override pkglibdir := $(pkglibdir)/pgsql\r
+ endif\r
+ endif\r
+ \r
+@@ -91,7 +91,7 @@\r
+ pkgincludedir = $(includedir)\r
+ ifeq "$(findstring pgsql, $(pkgincludedir))" ""\r
+ ifeq "$(findstring postgres, $(pkgincludedir))" ""\r
+-override pkgincludedir := $(pkgincludedir)/postgresql\r
++override pkgincludedir := $(pkgincludedir)/pgsql\r
+ endif\r
+ endif\r
+ includedir_server = $(pkgincludedir)/server\r
+diff -uNr postgresql-7.2devel.orig/src/test/regress/GNUmakefile postgresql-7.2devel/src/test/regress/GNUmakefile\r
+--- postgresql-7.2devel.orig/src/test/regress/GNUmakefile      Sun Sep 16 18:11:11 2001\r
++++ postgresql-7.2devel/src/test/regress/GNUmakefile   Mon Sep 17 01:58:31 2001\r
+@@ -68,8 +68,8 @@\r
+ abs_builddir := $(shell pwd)\r
+ \r
+ define sed-command\r
+-sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \\r
+-    -e 's,@abs_builddir@,$(abs_builddir),g' \\r
++sed -e 's,@abs_srcdir@,/usr/lib/pgsql/test/regress,g' \\r
++    -e 's,@abs_builddir@,/usr/lib/pgsql/test/regress,g' \\r
+     -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@\r
+ endef\r
+ \r
+diff -uNr postgresql-7.2devel.orig/src/test/regress/input/create_function_1.source postgresql-7.2devel/src/test/regress/input/create_function_1.source\r
+--- postgresql-7.2devel.orig/src/test/regress/input/create_function_1.source   Wed May 16 18:32:20 2001\r
++++ postgresql-7.2devel/src/test/regress/input/create_function_1.source        Mon Sep 17 01:58:31 2001\r
+@@ -4,41 +4,41 @@\r
+ \r
+ CREATE FUNCTION widget_in(opaque)\r
+    RETURNS widget\r
+-   AS '@abs_builddir@/regress@DLSUFFIX@'\r
++   AS '/usr/lib/pgsql/test/regress/regress.so'\r
+    LANGUAGE 'c';\r
+ \r
+ CREATE FUNCTION widget_out(opaque)\r
+    RETURNS opaque\r
+-   AS '@abs_builddir@/regress@DLSUFFIX@'\r
++   AS '/usr/lib/pgsql/test/regress/regress.so'\r
+    LANGUAGE 'c';\r
+ \r
+ CREATE FUNCTION check_primary_key ()\r
+       RETURNS opaque\r
+-      AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
++      AS '/usr/lib/pgsql/test/regress/refint.so'\r
+       LANGUAGE 'C';\r
+ \r
+ CREATE FUNCTION check_foreign_key ()\r
+       RETURNS opaque\r
+-      AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
++      AS '/usr/lib/pgsql/test/regress/refint.so'\r
+       LANGUAGE 'C';\r
+ \r
+ CREATE FUNCTION autoinc ()\r
+       RETURNS opaque\r
+-      AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'\r
++      AS '/usr/lib/pgsql/test/regress/autoinc.so'\r
+       LANGUAGE 'C';\r
+ \r
+ CREATE FUNCTION funny_dup17 ()\r
+         RETURNS opaque\r
+-        AS '@abs_builddir@/regress@DLSUFFIX@'\r
++        AS '/usr/lib/pgsql/test/regress/regress.so'\r
+         LANGUAGE 'C';\r
+ \r
+ CREATE FUNCTION ttdummy ()\r
+         RETURNS opaque\r
+-        AS '@abs_builddir@/regress@DLSUFFIX@'\r
++        AS '/usr/lib/pgsql/test/regress/regress.so'\r
+         LANGUAGE 'C';\r
+ \r
+ CREATE FUNCTION set_ttdummy (int4)\r
+         RETURNS int4\r
+-        AS '@abs_builddir@/regress@DLSUFFIX@'\r
++        AS '/usr/lib/pgsql/test/regress/regress.so'\r
+         LANGUAGE 'C';\r
+ \r
+diff -uNr postgresql-7.2devel.orig/src/test/regress/output/create_function_1.source postgresql-7.2devel/src/test/regress/output/create_function_1.source\r
+--- postgresql-7.2devel.orig/src/test/regress/output/create_function_1.source  Fri Aug 10 23:14:34 2001\r
++++ postgresql-7.2devel/src/test/regress/output/create_function_1.source       Mon Sep 17 02:01:47 2001\r
+@@ -3,34 +3,34 @@\r
+ --\r
+ CREATE FUNCTION widget_in(opaque)\r
+    RETURNS widget\r
+-   AS '@abs_builddir@/regress@DLSUFFIX@'\r
++   AS '/usr/lib/pgsql/test/regress/regress.so'\r
+    LANGUAGE 'c';\r
+ NOTICE:  ProcedureCreate: type widget is not yet defined\r
+ CREATE FUNCTION widget_out(opaque)\r
+    RETURNS opaque\r
+-   AS '@abs_builddir@/regress@DLSUFFIX@'\r
++   AS '/usr/lib/pgsql/test/regress/regress.so'\r
+    LANGUAGE 'c';\r
+ CREATE FUNCTION check_primary_key ()\r
+       RETURNS opaque\r
+-      AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
++      AS '/usr/lib/pgsql/test/regress/refint.so'\r
+       LANGUAGE 'C';\r
+ CREATE FUNCTION check_foreign_key ()\r
+       RETURNS opaque\r
+-      AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
++      AS '/usr/lib/pgsql/test/regress/refint.so'\r
+       LANGUAGE 'C';\r
+ CREATE FUNCTION autoinc ()\r
+       RETURNS opaque\r
+-      AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'\r
++      AS '/usr/lib/pgsql/test/regress/autoinc.so'\r
+       LANGUAGE 'C';\r
+ CREATE FUNCTION funny_dup17 ()\r
+         RETURNS opaque\r
+-        AS '@abs_builddir@/regress@DLSUFFIX@'\r
++        AS '/usr/lib/pgsql/test/regress/regress.so'\r
+         LANGUAGE 'C';\r
+ CREATE FUNCTION ttdummy ()\r
+         RETURNS opaque\r
+-        AS '@abs_builddir@/regress@DLSUFFIX@'\r
++        AS '/usr/lib/pgsql/test/regress/regress.so'\r
+         LANGUAGE 'C';\r
+ CREATE FUNCTION set_ttdummy (int4)\r
+         RETURNS int4\r
+-        AS '@abs_builddir@/regress@DLSUFFIX@'\r
++        AS '/usr/lib/pgsql/test/regress/regress.so'\r
+         LANGUAGE 'C';\r
+diff -uNr postgresql-7.2devel.orig/src/test/regress/pg_regress.sh postgresql-7.2devel/src/test/regress/pg_regress.sh\r
+--- postgresql-7.2devel.orig/src/test/regress/pg_regress.sh    Sun Sep 16 18:11:11 2001\r
++++ postgresql-7.2devel/src/test/regress/pg_regress.sh Mon Sep 17 02:02:56 2001\r
+@@ -70,7 +70,7 @@\r
+ : ${outputdir=.}\r
+ \r
+ libdir='@libdir@'\r
+-pkglibdir='@pkglibdir@'\r
++pkglibdir='/usr/lib/pgsql'\r
+ bindir='@bindir@'\r
+ datadir='@datadir@'\r
+ host_platform='@host_tuple@'\r