diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch new file mode 100644 index 0000000..bba62b9 --- /dev/null +++ b/postgresql-perl-rpath.patch @@ -0,0 +1,21 @@ +We configure Postgres with --disable-rpath because for the most part we +want to leave it to ldconfig to determine where libraries are. However, +for some reason the Perl package puts libperl.so in a nonstandard place +and doesn't add that place to the ldconfig search path. I think this +is a Perl packaging bug, myself, but apparently it's not going to change. +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 @@ + + 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 = plperl plperl_trigger plperl_shared plperl_elog + # where to find psql for running the tests diff --git a/postgresql-pl.changes b/postgresql-pl.changes index f0a8514..be13a3e 100644 --- a/postgresql-pl.changes +++ b/postgresql-pl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 9 14:11:37 CET 2010 - max@suse.de + +- Fix linking against libperl.so (bnc#578053) +- Fix package descriptions. + ------------------------------------------------------------------- Wed Sep 16 18:08:38 UTC 2009 - crrodriguez@novell.com diff --git a/postgresql-pl.spec b/postgresql-pl.spec index 1ef272d..ff3cc9a 100644 --- a/postgresql-pl.spec +++ b/postgresql-pl.spec @@ -24,12 +24,13 @@ BuildRequires: ncurses-devel BuildRequires: python-devel tcl-devel Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL Version: 8.4.2 -Release: 2 +Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) Group: Productivity/Databases/Servers Source0: postgresql-%version.tar.bz2 NoSource: 0 +Patch0: postgresql-perl-rpath.patch Url: http://www.postgresql.org/ Requires: postgresql-server = %pg_minor_version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,50 +42,32 @@ that supports an extended subset of the SQL standard, including transactions, foreign keys, subqueries, triggers, and user-defined types and functions. -This package contains the PL/Tcl, PL/Perl, and PL/Python procedural -languages for PostgreSQL. With these modules one can use Perl, Python, -and Tcl to write stored procedures, functions, and triggers. +This source package builds the PL/Tcl, PL/Perl, and PL/Python +procedural languages from the PostgreSQL source code. With these +modules one can use Perl, Python, and Tcl to write stored procedures, +functions, and triggers. -PostgreSQL also offers the built-in procedural language PL/SQL which is +PostgreSQL also offers the built-in procedural language PL/pgSQL which is included in the postgresql-server package. - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %package -n postgresql-plperl License: BSD3c(or similar) Summary: The PL/Tcl, PL/Perl, and PL/Python procedural languages for PostgreSQL Group: Productivity/Databases/Servers -Requires: perl +Requires: perl = %perl_version Obsoletes: postgresql-pl Provides: postgresql-pl:%_libdir/postgresql/plperl.so Requires: postgresql-server = %pg_minor_version %description -n postgresql-plperl -This package contains the the PL/Tcl, PL/Perl, and PL/Python procedural -languages for the back-end. With these modules one can use Perl, -Python, and Tcl to write stored procedures, functions and triggers. +PostgreSQL is an advanced object-relational database management system +that supports an extended subset of the SQL standard, including +transactions, foreign keys, subqueries, triggers, and user-defined +types and functions. -PostgreSQL also offers the builtin procedural language PL/SQL. - - - -Authors: --------- - Andrew Yu - Jolly Chen - Bruce Momjian - Thomas G. Lockhart - Tom Lane - The Hermit Hacker - etc. +This package contains the PL/Perl procedural language for PostgreSQL. +With this module one can use Perl to write stored procedures, +functions, and triggers. %package -n postgresql-plpython License: BSD3c(or similar) @@ -105,19 +88,6 @@ This package contains the PL/Python procedural language for PostgreSQL. With this module one can use Python to write stored procedures, functions, and triggers. -PostgreSQL also offers the built-in procedural language PL/SQL which is -included in the postgresql-server package. - - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %package -n postgresql-pltcl License: BSD3c(or similar) Summary: PL/Tcl Procedural Language for PostgreSQL @@ -137,23 +107,11 @@ This package contains the PL/Tcl procedural language for PostgreSQL. With thie module one can use Tcl to write stored procedures, functions, and triggers. -PostgreSQL also offers the built-in procedural language PL/SQL which is -included in the postgresql-server package. - - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %prep # The sources for the postgresql-pl package can be found # in the postgresql source RPM. %setup -q -n postgresql-%{version} +%patch0 %build export CFLAGS="%optflags $SP" diff --git a/postgresql.changes b/postgresql.changes index b9cb17c..9621385 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 9 14:42:29 CET 2010 - max@suse.de + +- Fix package descriptions. + ------------------------------------------------------------------- Wed Dec 16 16:19:20 CET 2009 - max@suse.de diff --git a/postgresql.spec b/postgresql.spec index fad4ba9..201b37e 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -24,7 +24,7 @@ BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-deve BuildRequires: ncurses-devel Summary: Basic Clients and Utilities for PostgreSQL Version: 8.4.2 -Release: 2 +Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) Group: Productivity/Databases/Tools @@ -58,16 +58,6 @@ as manual pages for the SQL commands that PostgreSQL supports. Full HTML documentation for PostgreSQL can be found in the postgresql-docs package. - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %package libs License: BSD3c(or similar) Summary: Shared Libraries Required for PostgreSQL Clients @@ -91,16 +81,6 @@ PostgreSQL client program or interface. You will need to install this package in order to use any other PostgreSQL package or any clients that need to connect to a PostgreSQL server. - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %package server License: BSD3c(or similar) Summary: The Programs Needed to Create and Run a PostgreSQL Server @@ -131,16 +111,6 @@ page is: file:///usr/share/doc/packages/postgresql/html/index.html . Manual pages for the PostgreSQL SQL statements can be found in the postgresql package. - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %package contrib License: BSD3c(or similar) Summary: Contributed Extensions and Additions to PostgreSQL @@ -160,16 +130,6 @@ officially part of the PostgreSQL core. Documentation for the modules contained in this package can be found in /usr/share/doc/packages/postgresql/contrib. - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %description server PostgreSQL is an advanced object-relational database management system that supports an extended subset of the SQL standard, including @@ -180,16 +140,6 @@ This package includes the programs needed to create and run a PostgreSQL server, which will in turn allow you to create and maintain PostgreSQL databases. - - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %package devel License: BSD3c(or similar) Summary: PostgreSQL development header files and libraries @@ -209,15 +159,6 @@ need to install this package if you want to develop applications in C which will interact with a PostgreSQL server. - -Authors: --------- - Marc G. Fournier - Tom Lane - Vadim B. Mikheev - Bruce Momjian - Jan Wieck - %prep %setup -q %patch1