[packages/postgresql.git] / postgresql-rpm.patch

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
Commit	Line	Data
71648486 GS	1	diff -uNr postgresql-7.2devel.orig/src/Makefile.global.in postgresql-7.2devel/src/Makefile.global.in\r
	2	--- postgresql-7.2devel.orig/src/Makefile.global.in Sun Sep 16 18:11:09 2001\r
	3	+++ postgresql-7.2devel/src/Makefile.global.in Mon Sep 17 02:08:29 2001\r
	4	@@ -83,7 +83,7 @@\r
	5	pkglibdir = $(libdir)\r
	6	ifeq "$(findstring pgsql, $(pkglibdir))" ""\r
	7	ifeq "$(findstring postgres, $(pkglibdir))" ""\r
	8	-override pkglibdir := $(pkglibdir)/postgresql\r
	9	+override pkglibdir := $(pkglibdir)/pgsql\r
	10	endif\r
	11	endif\r
	12	\r
	13	@@ -91,7 +91,7 @@\r
	14	pkgincludedir = $(includedir)\r
	15	ifeq "$(findstring pgsql, $(pkgincludedir))" ""\r
	16	ifeq "$(findstring postgres, $(pkgincludedir))" ""\r
	17	-override pkgincludedir := $(pkgincludedir)/postgresql\r
	18	+override pkgincludedir := $(pkgincludedir)/pgsql\r
	19	endif\r
	20	endif\r
	21	includedir_server = $(pkgincludedir)/server\r
	22	diff -uNr postgresql-7.2devel.orig/src/test/regress/GNUmakefile postgresql-7.2devel/src/test/regress/GNUmakefile\r
	23	--- postgresql-7.2devel.orig/src/test/regress/GNUmakefile Sun Sep 16 18:11:11 2001\r
	24	+++ postgresql-7.2devel/src/test/regress/GNUmakefile Mon Sep 17 01:58:31 2001\r
	25	@@ -68,8 +68,8 @@\r
	26	abs_builddir := $(shell pwd)\r
	27	\r
	28	define sed-command\r
	29	-sed -e 's,@abs_srcdir@,$(abs_srcdir),g' \\r
	30	- -e 's,@abs_builddir@,$(abs_builddir),g' \\r
	31	+sed -e 's,@abs_srcdir@,/usr/lib/pgsql/test/regress,g' \\r
	32	+ -e 's,@abs_builddir@,/usr/lib/pgsql/test/regress,g' \\r
	33	-e 's/@DLSUFFIX@/$(DLSUFFIX)/g' $< >$@\r
	34	endef\r
	35	\r
	36	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
	37	--- postgresql-7.2devel.orig/src/test/regress/input/create_function_1.source Wed May 16 18:32:20 2001\r
	38	+++ postgresql-7.2devel/src/test/regress/input/create_function_1.source Mon Sep 17 01:58:31 2001\r
	39	@@ -4,41 +4,41 @@\r
	40	\r
	41	CREATE FUNCTION widget_in(opaque)\r
	42	RETURNS widget\r
	43	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
	44	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
	45	LANGUAGE 'c';\r
	46	\r
	47	CREATE FUNCTION widget_out(opaque)\r
	48	RETURNS opaque\r
	49	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
	50	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
	51	LANGUAGE 'c';\r
	52	\r
	53	CREATE FUNCTION check_primary_key ()\r
	54	RETURNS opaque\r
	55	- AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
	56	+ AS '/usr/lib/pgsql/test/regress/refint.so'\r
	57	LANGUAGE 'C';\r
	58	\r
	59	CREATE FUNCTION check_foreign_key ()\r
	60	RETURNS opaque\r
	61	- AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
	62	+ AS '/usr/lib/pgsql/test/regress/refint.so'\r
	63	LANGUAGE 'C';\r
	64	\r
65	CREATE FUNCTION autoinc ()\r
66	RETURNS opaque\r
67	- AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'\r
68	+ AS '/usr/lib/pgsql/test/regress/autoinc.so'\r
69	LANGUAGE 'C';\r
70	\r
71	CREATE FUNCTION funny_dup17 ()\r
72	RETURNS opaque\r
73	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
74	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
75	LANGUAGE 'C';\r
76	\r
77	CREATE FUNCTION ttdummy ()\r
78	RETURNS opaque\r
79	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
80	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
81	LANGUAGE 'C';\r
82	\r
83	CREATE FUNCTION set_ttdummy (int4)\r
84	RETURNS int4\r
85	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
86	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
87	LANGUAGE 'C';\r
88	\r
89	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
90	--- postgresql-7.2devel.orig/src/test/regress/output/create_function_1.source Fri Aug 10 23:14:34 2001\r
91	+++ postgresql-7.2devel/src/test/regress/output/create_function_1.source Mon Sep 17 02:01:47 2001\r
92	@@ -3,34 +3,34 @@\r
93	--\r
94	CREATE FUNCTION widget_in(opaque)\r
95	RETURNS widget\r
96	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
97	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
98	LANGUAGE 'c';\r
99	NOTICE: ProcedureCreate: type widget is not yet defined\r
100	CREATE FUNCTION widget_out(opaque)\r
101	RETURNS opaque\r
102	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
103	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
104	LANGUAGE 'c';\r
105	CREATE FUNCTION check_primary_key ()\r
106	RETURNS opaque\r
107	- AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
108	+ AS '/usr/lib/pgsql/test/regress/refint.so'\r
109	LANGUAGE 'C';\r
110	CREATE FUNCTION check_foreign_key ()\r
111	RETURNS opaque\r
112	- AS '@abs_builddir@/../../../contrib/spi/refint@DLSUFFIX@'\r
113	+ AS '/usr/lib/pgsql/test/regress/refint.so'\r
114	LANGUAGE 'C';\r
115	CREATE FUNCTION autoinc ()\r
116	RETURNS opaque\r
117	- AS '@abs_builddir@/../../../contrib/spi/autoinc@DLSUFFIX@'\r
118	+ AS '/usr/lib/pgsql/test/regress/autoinc.so'\r
119	LANGUAGE 'C';\r
120	CREATE FUNCTION funny_dup17 ()\r
121	RETURNS opaque\r
122	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
123	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
124	LANGUAGE 'C';\r
125	CREATE FUNCTION ttdummy ()\r
126	RETURNS opaque\r
127	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
128	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
129	LANGUAGE 'C';\r
130	CREATE FUNCTION set_ttdummy (int4)\r
131	RETURNS int4\r
132	- AS '@abs_builddir@/regress@DLSUFFIX@'\r
133	+ AS '/usr/lib/pgsql/test/regress/regress.so'\r
134	LANGUAGE 'C';\r
135	diff -uNr postgresql-7.2devel.orig/src/test/regress/pg_regress.sh postgresql-7.2devel/src/test/regress/pg_regress.sh\r
136	--- postgresql-7.2devel.orig/src/test/regress/pg_regress.sh Sun Sep 16 18:11:11 2001\r
137	+++ postgresql-7.2devel/src/test/regress/pg_regress.sh Mon Sep 17 02:02:56 2001\r
138	@@ -70,7 +70,7 @@\r
139	: ${outputdir=.}\r
140	\r
141	libdir='@libdir@'\r
142	-pkglibdir='@pkglibdir@'\r
143	+pkglibdir='/usr/lib/pgsql'\r
144	bindir='@bindir@'\r
145	datadir='@datadir@'\r
146	host_platform='@host_tuple@'\r