rpms/sepostgresql/devel sepostgresql-fedora-prefix.patch, 1.1, 1.2 sepostgresql.spec, 1.39, 1.40

[KaiGai Kohei]

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30587

Modified Files:
	sepostgresql-fedora-prefix.patch sepostgresql.spec 
Log Message:
update: sepostgresql-fedora-prefix.patch for 8.4.x
 and fixes in sepostgresql.spec


sepostgresql-fedora-prefix.patch:
 Makefile.global.in       |   10 +++++-----
 bin/initdb/initdb.c      |    2 +-
 bin/pg_ctl/pg_ctl.c      |    2 +-
 bin/pg_dump/pg_dumpall.c |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

Index: sepostgresql-fedora-prefix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-fedora-prefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sepostgresql-fedora-prefix.patch	1 Sep 2007 13:07:32 -0000	1.1
+++ sepostgresql-fedora-prefix.patch	19 Aug 2009 12:26:11 -0000	1.2
@@ -1,8 +1,8 @@
-Index: trunk/src/Makefile.global.in
+Index: sepgsql/src/Makefile.global.in
 ===================================================================
---- trunk/src/Makefile.global.in	(revision 430)
-+++ trunk/src/Makefile.global.in	(working copy)
-@@ -73,14 +73,14 @@
+--- sepgsql/src/Makefile.global.in	(revision 2237)
++++ sepgsql/src/Makefile.global.in	(working copy)
+@@ -75,14 +75,14 @@
  datadir := @datadir@
  ifeq "$(findstring pgsql, $(datadir))" ""
  ifeq "$(findstring postgres, $(datadir))" ""
@@ -19,7 +19,7 @@ Index: trunk/src/Makefile.global.in
  endif
  endif
  
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
  pkglibdir = $(libdir)
  ifeq "$(findstring pgsql, $(pkglibdir))" ""
  ifeq "$(findstring postgres, $(pkglibdir))" ""
@@ -28,7 +28,7 @@ Index: trunk/src/Makefile.global.in
  endif
  endif
  
-@@ -98,7 +98,7 @@
+@@ -100,7 +100,7 @@
  pkgincludedir = $(includedir)
  ifeq "$(findstring pgsql, $(pkgincludedir))" ""
  ifeq "$(findstring postgres, $(pkgincludedir))" ""
@@ -38,45 +38,45 @@ Index: trunk/src/Makefile.global.in
  endif
  
 @@ -109,7 +109,7 @@
- ifneq (,$(docdir))
+ docdir := @docdir@
  ifeq "$(findstring pgsql, $(docdir))" ""
  ifeq "$(findstring postgres, $(docdir))" ""
 -override docdir := $(docdir)/postgresql
 +override docdir := $(docdir)/sepgsql
  endif
  endif
- endif
-Index: trunk/src/bin/pg_ctl/pg_ctl.c
+ 
+Index: sepgsql/src/bin/pg_ctl/pg_ctl.c
 ===================================================================
---- trunk/src/bin/pg_ctl/pg_ctl.c	(revision 429)
-+++ trunk/src/bin/pg_ctl/pg_ctl.c	(working copy)
-@@ -557,7 +557,7 @@
+--- sepgsql/src/bin/pg_ctl/pg_ctl.c	(revision 2237)
++++ sepgsql/src/bin/pg_ctl/pg_ctl.c	(working copy)
+@@ -643,7 +643,7 @@
  
  		postmaster_path = pg_malloc(MAXPGPATH);
  
--		if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR,
-+		if ((ret = find_other_exec(argv0, "sepostgres", PM_VERSIONSTR,
+-		if ((ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,
++		if ((ret = find_other_exec(argv0, "sepostgres", PG_BACKEND_VERSIONSTR,
  								   postmaster_path)) < 0)
  		{
  			char		full_path[MAXPGPATH];
-Index: trunk/src/bin/initdb/initdb.c
+Index: sepgsql/src/bin/initdb/initdb.c
 ===================================================================
---- trunk/src/bin/initdb/initdb.c	(revision 429)
-+++ trunk/src/bin/initdb/initdb.c	(working copy)
-@@ -2646,7 +2646,7 @@
+--- sepgsql/src/bin/initdb/initdb.c	(revision 2237)
++++ sepgsql/src/bin/initdb/initdb.c	(working copy)
+@@ -2763,7 +2763,7 @@
  	sprintf(pgdenv, "PGDATA=%s", pg_data);
  	putenv(pgdenv);
  
--	if ((ret = find_other_exec(argv[0], "postgres", PG_VERSIONSTR,
-+	if ((ret = find_other_exec(argv[0], "sepostgres", PG_VERSIONSTR,
+-	if ((ret = find_other_exec(argv[0], "postgres", PG_BACKEND_VERSIONSTR,
++	if ((ret = find_other_exec(argv[0], "sepostgres", PG_BACKEND_VERSIONSTR,
  							   backend_exec)) < 0)
  	{
  		char		full_path[MAXPGPATH];
-Index: trunk/src/bin/pg_dump/pg_dumpall.c
+Index: sepgsql/src/bin/pg_dump/pg_dumpall.c
 ===================================================================
---- trunk/src/bin/pg_dump/pg_dumpall.c	(revision 429)
-+++ trunk/src/bin/pg_dump/pg_dumpall.c	(working copy)
-@@ -139,7 +139,7 @@
+--- sepgsql/src/bin/pg_dump/pg_dumpall.c	(revision 2237)
++++ sepgsql/src/bin/pg_dump/pg_dumpall.c	(working copy)
+@@ -157,7 +157,7 @@
  		}
  	}
  


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sepostgresql.spec	19 Aug 2009 12:00:30 -0000	1.39
+++ sepostgresql.spec	19 Aug 2009 12:26:11 -0000	1.40
@@ -94,7 +94,7 @@ mv %{buildroot}%{_bindir}.orig/pg_dumpal
 rm -rf %{buildroot}%{_bindir}.orig
 rm -rf %{buildroot}%{_libdir}
 rm -rf %{buildroot}%{_includedir}
-rm -rf %{buildroot}%{_usr}/doc
+rm -rf %{buildroot}%{_datadir}/doc
 rm -rf %{buildroot}%{_datadir}/sepgsql/timezone
 rm -rf %{buildroot}%{_mandir}