From fe82c7846e14a24ed2eca39dfa8cf53ec3deb9fc8d1d0fe93d43bf01edc1409e Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 18 Jun 2010 14:11:48 +0000
Subject: [PATCH 1/2] Accepting request 41689 from
 home:coolo:branches:openSUSE:Factory

Copy from home:coolo:branches:openSUSE:Factory/postgresql via accept of submit request 41689 revision 2.
Request was accepted with message:
self accept

OBS-URL: https://build.opensuse.org/request/show/41689
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=39
---
 postgresql-perl-return.patch | 12 ++++++++++++
 postgresql-perl-rpath.patch  | 12 +++++++-----
 postgresql-pl.changes        |  5 +++++
 postgresql-pl.spec           |  3 ++-
 4 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 postgresql-perl-return.patch

diff --git a/postgresql-perl-return.patch b/postgresql-perl-return.patch
new file mode 100644
index 0000000..0bd63cc
--- /dev/null
+++ b/postgresql-perl-return.patch
@@ -0,0 +1,12 @@
+Index: postgresql-8.4.4/src/pl/plperl/plperl.c
+===================================================================
+--- postgresql-8.4.4.orig/src/pl/plperl/plperl.c	2010-05-13 18:40:36.000000000 +0200
++++ postgresql-8.4.4/src/pl/plperl/plperl.c	2010-06-18 10:18:15.758499052 +0200
+@@ -535,6 +535,7 @@ pp_require_safe(pTHX)
+ 		RETPUSHYES;
+ 
+ 	DIE(aTHX_ "Unable to load %s into plperl", name);
++	return 0;
+ }
+ 
+ 
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index bba62b9..a6b6bf4 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -7,15 +7,17 @@ So work around it by adding an rpath spec to plperl.so (only).
 Per bug #162198.
 
 
---- src/pl/plperl/GNUmakefile	2009-06-05 14:29:56.000000000 -0400
-+++ src/pl/plperl/GNUmakefile	2009-08-12 23:28:57.000000000 -0400
-@@ -38,6 +38,9 @@
+Index: src/pl/plperl/GNUmakefile
+===================================================================
+--- src/pl/plperl/GNUmakefile.orig	2010-05-13 18:40:36.000000000 +0200
++++ src/pl/plperl/GNUmakefile	2010-06-18 10:10:04.296498028 +0200
+@@ -38,6 +38,9 @@ OBJS = plperl.o spi_internal.o SPI.o
  
  SHLIB_LINK = $(perl_embed_ldflags)
  
 +# Force rpath to be used even though we disable it everywhere else
 +SHLIB_LINK += $(rpath)
 +
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl
+ REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl  --load-language=plperlu
  REGRESS = plperl plperl_trigger plperl_shared plperl_elog
- # where to find psql for running the tests
+ # if Perl can support two interpreters in one backend, 
diff --git a/postgresql-pl.changes b/postgresql-pl.changes
index 0e11d4b..ec23a49 100644
--- a/postgresql-pl.changes
+++ b/postgresql-pl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 18 08:42:42 UTC 2010 - coolo@novell.com
+
+- fix build
+
 -------------------------------------------------------------------
 Thu Mar 11 18:24:28 CET 2010 - max@suse.de
 
diff --git a/postgresql-pl.spec b/postgresql-pl.spec
index 46b1fb6..f08306e 100644
--- a/postgresql-pl.spec
+++ b/postgresql-pl.spec
@@ -32,8 +32,8 @@ Release:        1
 License:        BSD3c(or similar)
 Group:          Productivity/Databases/Servers
 Source0:        postgresql-%version.tar.bz2
-NoSource:       0
 Patch0:         postgresql-perl-rpath.patch
+Patch1:         postgresql-perl-return.patch
 Url:            http://www.postgresql.org/
 Requires:       postgresql-server = %pg_minor_version
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -115,6 +115,7 @@ and triggers.
 # in the postgresql source RPM.
 %setup -q -n postgresql-%{version}
 %patch0
+%patch1 -p1
 
 %build
 export CFLAGS="%optflags $SP"

From 242b0e77caeb65c6694e42afec43c0fad8ba709e4b1cf074ebad7dcf1ab4b7fa Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Mon, 21 Jun 2010 15:50:55 +0000
Subject: [PATCH 2/2] Updating link to change in openSUSE:Factory/postgresql
 revision 23.0

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=9db3b2c61abc54c2a2fd9a7e25df1bb9
---
 postgresql-pl.spec | 2 +-
 postgresql.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/postgresql-pl.spec b/postgresql-pl.spec
index f08306e..953e1ac 100644
--- a/postgresql-pl.spec
+++ b/postgresql-pl.spec
@@ -27,7 +27,7 @@ BuildRequires:  krb5-devel libxslt-devel
 BuildRequires:  python-devel tcl-devel
 Summary:        The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL
 Version:        8.4.4
-Release:        1
+Release:        2
 %define pg_minor_version %(echo %version | cut -f1-2 -d.)
 License:        BSD3c(or similar)
 Group:          Productivity/Databases/Servers
diff --git a/postgresql.spec b/postgresql.spec
index 62c34aa..3389631 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -26,7 +26,7 @@ BuildRequires:  krb5-devel libxslt-devel
 %endif
 Summary:        Basic Clients and Utilities for PostgreSQL
 Version:        8.4.4
-Release:        1
+Release:        2
 %define pg_minor_version %(echo %version | cut -f1-2 -d.)
 License:        BSD3c(or similar)
 Group:          Productivity/Databases/Tools