Accepting request 71411 from server:database:postgresql

Fix build with Perl 5.14

OBS-URL: https://build.opensuse.org/request/show/71411
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postgresql?expand=0&rev=33

postgresql-9.0.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf429421dea73a7bd5ef9fbdd1212a0d01c0f63c2059e0218a0e350891867b35
-size 14040705

postgresql-9.0.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30572706e3176228415991895e63a8b77343a5abad11407961cfd08790be9e84
+size 14040871

postgresql-libs.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Wed May 25 13:06:16 UTC 2011 - max@novell.com
+
+- Fix file name of last added patch and remove overlong comment.
+
+-------------------------------------------------------------------
+Wed May 25 08:06:44 UTC 2011 - idonmez@novell.com
+
+- Add postgresql-9.0.4-perl514.patch: For Perl 5.14 GvCV(sv) is no
+  longer an lvalue and needs to be replaced by GvCV_set(sv, value) 
+
+-------------------------------------------------------------------
+Thu Apr 21 10:06:45 UTC 2011 - max@novell.com
+
+- Bugfix release: 9.0.4:
+  * This update contains a critical fix to the pg_upgrade utility
+    which prevents significant downtime issues. Do not use
+    pg_upgrade without installing this update first.
+    http://wiki.postgresql.org/wiki/20110408pg_upgrade_fix
+  * change SQLSTATE for Hot Standby warnings
+  * prevent bgwriter hang during recovery
+  * prevent recursive composite type creation
+  * disallow dropping tables whose triggers are still pending
+  * allow use of "replication" as a user name
+  * prevent a crash during GEQO planning
+  * improve join plans for tables with missing statistics
+  * fix error with SELECT FOR UPDATE in a subselect
+  * close PL/python array slice memory leak
+  * allow SSL connections for users with no home directory
+- http://www.postgresql.org/docs/9.0/static/release-9-0-4.html
+
+-------------------------------------------------------------------
+Fri Apr  1 10:23:05 UTC 2011 - nkrinner@novell.com
+
+- enabled --with-ossp-uuid
+
+-------------------------------------------------------------------
+Fri Mar  4 15:02:11 UTC 2011 - max@novell.com
+
+- Fix the fix of the fix for the successors of postgresql-libs. 
+
 -------------------------------------------------------------------
 Mon Feb 21 01:09:08 CET 2011 - ro@suse.de
 

postgresql-libs.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package postgresql-libs
+# spec file for package postgresql
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,20 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           postgresql-libs
 %define _name postgresql
 %define libpq libpq5
 %define libecpg libecpg6
 %define buildall 0
 %if 0%{?suse_version} > 910
-BuildRequires:  krb5-devel libxslt-devel
+BuildRequires:  krb5-devel libxslt-devel 
 %endif
 BuildRequires:  openldap2-devel openssl-devel
 Summary:        Basic Clients and Utilities for PostgreSQL
-Version:        9.0.3
+Version:        9.0.4
-Release:        3
+Release:        2
 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/')
 License:        BSD3c(or similar)
 Group:          Productivity/Databases/Tools
@@ -47,10 +45,10 @@ Patch1:         postgresql-conf.patch
 Patch2:         postgresql-regress.patch
 Patch3:         postgresql-sle10-timestamptz.patch
 Patch4:         postgresql-plperl.patch
+Patch5:         postgresql-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
-
 %description
 PostgreSQL is an advanced object-relational database management system
 that supports an extended subset of the SQL standard, including
@@ -64,13 +62,11 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs
 package.
 
 %package -n %libpq
-
-
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
 Group:          Productivity/Databases/Clients
-Obsoletes:      postgresql-libs
+Provides:       postgresql-libs = %version
-Provides:       postgresql-libs
+Obsoletes:      postgresql-libs < %version
 # bug437293
 %ifarch ppc64
 Obsoletes:      postgresql-libs-64bit
@@ -86,16 +82,10 @@ This package provides the client library that most PostgreSQL client
 program or language bindings are using.
 
 %package -n %libecpg
-
-
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
 Group:          Productivity/Databases/Clients
-Obsoletes:      postgresql-libs
+Provides:       postgresql-libs:%_libdir/libecpg.so.6
-# bug437293
-%ifarch ppc64
-Obsoletes:      postgresql-libs-64bit
-%endif
 
 %description -n %libecpg
 PostgreSQL is an advanced object-relational database management system
@@ -107,8 +97,6 @@ This package provides the runtime library of the embedded SQL C
 preprocessor for PostgreSQL.
 
 %package -n %_name-devel
-
-
 License:        BSD3c(or similar)
 Summary:        PostgreSQL development header files and libraries
 Group:          Productivity/Databases/Tools
@@ -136,6 +124,7 @@ which will interact with a PostgreSQL server.
 %patch3 -p1
 %endif
 %patch4
+%patch5 -p1
 
 %build
 export CFLAGS="%optflags $SP"
@@ -190,13 +179,9 @@ rm -f $(ls %buildroot/%_libdir/*.a | grep -F -v libpgport.a)
 %find_lang ecpglib6-%{pg_minor_version} %libecpg.lang
 %find_lang ecpg-%{pg_minor_version} %_name-devel.lang 
 %find_lang pg_config-%{pg_minor_version} %_name-devel.lang 
-
 %post -n %libpq -p /sbin/ldconfig
-
 %postun -n %libpq -p /sbin/ldconfig
-
 %post -n %libecpg -p /sbin/ldconfig
-
 %postun -n %libecpg -p /sbin/ldconfig
 
 %clean

postgresql-mkspecfiles

@@ -5,7 +5,8 @@ sed '/IF_LIBS/,/FI_LIBS/d
      /FI_POSTGRES/d
 ' postgresql.spec.in > postgresql.spec
 
-sed '/IF_POSTGRES/,/FI_POSTGRES/d
+sed '/^Name: /s/$/-libs/
+     /IF_POSTGRES/,/FI_POSTGRES/d
      /IF_LIBS/d
      /FI_LIBS/d
 ' postgresql.spec.in > postgresql-libs.spec

postgresql-perl514.patch

@@ -0,0 +1,23 @@
+--- postgresql-9.0.4/src/pl/plperl/plperl.c	2011-04-15 05:15:53.000000000 +0200
++++ postgresql-9.0.4/src/pl/plperl/plperl.c	2011-05-25 10:01:08.543018259 +0200
+@@ -874,7 +874,7 @@
+ 		if (!isGV_with_GP(sv) || !GvCV(sv))
+ 			continue;
+ 		SvREFCNT_dec(GvCV(sv)); /* free the CV */
+-		GvCV(sv) = NULL;		/* prevent call via GV */
++		GvCV_set(sv, NULL);		/* prevent call via GV */
+ 	}
+ 	hv_clear(stash);
+ 
+--- postgresql-9.0.4/src/pl/plperl/plperl.h	2011-04-15 05:15:53.000000000 +0200
++++ postgresql-9.0.4/src/pl/plperl/plperl.h	2011-05-25 10:12:02.358018289 +0200
+@@ -53,6 +53,8 @@
+ void		plperl_spi_freeplan(char *);
+ void		plperl_spi_cursor_close(char *);
+ 
+-
++#ifndef GvCV_set
++#    define GvCV_set(gv, cv) (GvCV(gv)=(cv))
++#endif
+ 
+ #endif   /* PL_PERL_H */

postgresql.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Wed May 25 13:06:16 UTC 2011 - max@novell.com
+
+- Fix file name of last added patch and remove overlong comment.
+
+-------------------------------------------------------------------
+Wed May 25 08:06:44 UTC 2011 - idonmez@novell.com
+
+- Add postgresql-9.0.4-perl514.patch: For Perl 5.14 GvCV(sv) is no
+  longer an lvalue and needs to be replaced by GvCV_set(sv, value) 
+
+-------------------------------------------------------------------
+Thu Apr 21 10:06:45 UTC 2011 - max@novell.com
+
+- Bugfix release: 9.0.4:
+  * This update contains a critical fix to the pg_upgrade utility
+    which prevents significant downtime issues. Do not use
+    pg_upgrade without installing this update first.
+    http://wiki.postgresql.org/wiki/20110408pg_upgrade_fix
+  * change SQLSTATE for Hot Standby warnings
+  * prevent bgwriter hang during recovery
+  * prevent recursive composite type creation
+  * disallow dropping tables whose triggers are still pending
+  * allow use of "replication" as a user name
+  * prevent a crash during GEQO planning
+  * improve join plans for tables with missing statistics
+  * fix error with SELECT FOR UPDATE in a subselect
+  * close PL/python array slice memory leak
+  * allow SSL connections for users with no home directory
+- http://www.postgresql.org/docs/9.0/static/release-9-0-4.html
+
+-------------------------------------------------------------------
+Fri Apr  1 10:23:05 UTC 2011 - nkrinner@novell.com
+
+- enabled --with-ossp-uuid
+
+-------------------------------------------------------------------
+Fri Mar  4 15:02:11 UTC 2011 - max@novell.com
+
+- Fix the fix of the fix for the successors of postgresql-libs. 
+
 -------------------------------------------------------------------
 Mon Feb 21 01:09:08 CET 2011 - ro@suse.de
 

postgresql.spec

@@ -15,10 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           postgresql
-BuildRequires:  gettext-devel ncurses-devel readline-devel zlib-devel
+BuildRequires:  gettext-devel zlib-devel ncurses-devel readline-devel uuid-devel  
 BuildRequires:  pam-devel python-devel tcl-devel
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
@@ -30,12 +28,12 @@ BuildRequires:  fdupes
 %define libecpg libecpg6
 %define buildall 0
 %if 0%{?suse_version} > 910
-BuildRequires:  krb5-devel libxslt-devel
+BuildRequires:  krb5-devel libxslt-devel 
 %endif
 BuildRequires:  openldap2-devel openssl-devel
 Summary:        Basic Clients and Utilities for PostgreSQL
-Version:        9.0.3
+Version:        9.0.4
-Release:        3
+Release:        2
 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/')
 License:        BSD3c(or similar)
 Group:          Productivity/Databases/Tools
@@ -54,10 +52,10 @@ Patch1:         postgresql-conf.patch
 Patch2:         postgresql-regress.patch
 Patch3:         postgresql-sle10-timestamptz.patch
 Patch4:         postgresql-plperl.patch
+Patch5:         postgresql-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
-
 %description
 PostgreSQL is an advanced object-relational database management system
 that supports an extended subset of the SQL standard, including
@@ -71,13 +69,11 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs
 package.
 
 %package -n %libpq
-
-
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
 Group:          Productivity/Databases/Clients
-Obsoletes:      postgresql-libs
+Provides:       postgresql-libs = %version
-Provides:       postgresql-libs
+Obsoletes:      postgresql-libs < %version
 # bug437293
 %ifarch ppc64
 Obsoletes:      postgresql-libs-64bit
@@ -93,16 +89,10 @@ This package provides the client library that most PostgreSQL client
 program or language bindings are using.
 
 %package -n %libecpg
-
-
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
 Group:          Productivity/Databases/Clients
-Obsoletes:      postgresql-libs
+Provides:       postgresql-libs:%_libdir/libecpg.so.6
-# bug437293
-%ifarch ppc64
-Obsoletes:      postgresql-libs-64bit
-%endif
 
 %description -n %libecpg
 PostgreSQL is an advanced object-relational database management system
@@ -173,8 +163,6 @@ PostgreSQL server, which will in turn allow you to create and maintain
 PostgreSQL databases.
 
 %package -n %_name-devel
-
-
 License:        BSD3c(or similar)
 Summary:        PostgreSQL development header files and libraries
 Group:          Productivity/Databases/Tools
@@ -258,6 +246,7 @@ and triggers.
 %patch3 -p1
 %endif
 %patch4
+%patch5 -p1
 
 %build
 export CFLAGS="%optflags $SP"
@@ -276,6 +265,7 @@ export CFLAGS="%optflags $SP"
         --with-tcl \
         --with-tclconfig=%_libdir \
 	--with-pam \
+        --with-ossp-uuid \
 	--with-openssl \
 	--with-ldap \
 %if 0%{?suse_version} > 910
@@ -391,13 +381,9 @@ exit 0
 groupadd -g 26 -o -r postgres >/dev/null 2>/dev/null || :
 useradd -g postgres -o -r -d /var/lib/pgsql -s /bin/bash \
 	-c "PostgreSQL Server" -u 26 postgres 2>/dev/null || :
-
 %post -n %libpq -p /sbin/ldconfig
-
 %postun -n %libpq -p /sbin/ldconfig
-
 %post -n %libecpg -p /sbin/ldconfig
-
 %postun -n %libecpg -p /sbin/ldconfig
 
 %clean
@@ -511,7 +497,6 @@ rm -f %my_provides
 %_libdir/postgresql/plpython*.so
 
 %if %buildall
-
 %files -n %libpq -f %libpq.lang
 %defattr(-,root,root)
 %_libdir/libpq.so.*
@@ -536,5 +521,4 @@ rm -f %my_provides
 %_datadir/postgresql/pg_service.conf.sample
 
 %endif
-
 %changelog

postgresql.spec.in

@@ -1,7 +1,7 @@
 #
-# spec file for package postgresql (Version 8.4.3)
+# spec file for package postgresql
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,9 +15,9 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-IF_POSTGRES
 Name:           postgresql
-BuildRequires:  gettext-devel zlib-devel ncurses-devel readline-devel
+IF_POSTGRES
+BuildRequires:  gettext-devel zlib-devel ncurses-devel readline-devel uuid-devel  
 BuildRequires:  pam-devel python-devel tcl-devel
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
@@ -25,19 +25,16 @@ BuildRequires:  fdupes
 %define fdupes #
 %endif
 FI_POSTGRES
-IF_LIBS
-Name:           postgresql-libs
-FI_LIBS
 %define _name postgresql
 %define libpq libpq5
 %define libecpg libecpg6
 %define buildall 0
 %if 0%{?suse_version} > 910
-BuildRequires:  krb5-devel libxslt-devel
+BuildRequires:  krb5-devel libxslt-devel 
 %endif
 BuildRequires:  openldap2-devel openssl-devel
 Summary:        Basic Clients and Utilities for PostgreSQL
-Version:        9.0.3
+Version:        9.0.4
 Release:        2
 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/')
 License:        BSD3c(or similar)
@@ -57,6 +54,7 @@ Patch1:         postgresql-conf.patch
 Patch2:         postgresql-regress.patch
 Patch3:         postgresql-sle10-timestamptz.patch
 Patch4:         postgresql-plperl.patch
+Patch5:         postgresql-perl514.patch
 Url:            http://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %pg_minor_version
@@ -76,7 +74,8 @@ package.
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
 Group:          Productivity/Databases/Clients
-Obsoletes:      postgresql-libs
+Provides:       postgresql-libs = %version
+Obsoletes:      postgresql-libs < %version
 # bug437293
 %ifarch ppc64
 Obsoletes:      postgresql-libs-64bit
@@ -95,12 +94,7 @@ program or language bindings are using.
 License:        BSD3c(or similar)
 Summary:        Shared Libraries Required for PostgreSQL Clients
 Group:          Productivity/Databases/Clients
-Obsoletes:      postgresql-libs
+Provides:       postgresql-libs:%_libdir/libecpg.so.6
-Provides:       postgresql-libs
-# bug437293
-%ifarch ppc64
-Obsoletes:      postgresql-libs-64bit
-%endif
 
 %description -n %libecpg
 PostgreSQL is an advanced object-relational database management system
@@ -258,6 +252,7 @@ FI_POSTGRES
 %patch3 -p1
 %endif
 %patch4
+%patch5 -p1
 
 %build
 export CFLAGS="%optflags $SP"
@@ -277,6 +272,7 @@ IF_POSTGRES
         --with-tcl \
         --with-tclconfig=%_libdir \
 	--with-pam \
+        --with-ossp-uuid \
 FI_POSTGRES
 IF_LIBS
         --without-readline \