# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1344531736 -7200
# Node ID 7911e95d784763946d5dcac1d947607800484604
# Parent  a5345734c62cf760bf18205721bc221900eb19ee
Update version, remove unused TCL, and correct pg_config(1) thread use.

diff -r a5345734c62c -r 7911e95d7847 postgresql/postgresql.spec
--- a/postgresql/postgresql.spec	Thu Aug 09 18:57:21 2012 +0200
+++ b/postgresql/postgresql.spec	Thu Aug 09 19:02:16 2012 +0200
@@ -1,6 +1,6 @@
 ##
 ##  postgresql.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -22,16 +22,16 @@
 ##
 
 #   package versions
-%define       V_postgresql      9.0.0
-%define       V_postgresql_dist 9.0.0
-%define       V_postgresql_dir  9.0.0
-%define       V_libpqxx         3.1
+%define       V_postgresql      9.1.4
+%define       V_postgresql_dist 9.1.4
+%define       V_postgresql_dir  9.1.4
+%define       V_libpqxx         4.0
 %define       V_perl            5.10.0
 %define       V_pgperl          2.0.2
 %define       V_psqlodbc        09.00.0200
-%define       V_pgjdbc          9.0-801
+%define       V_pgjdbc          9.1-902
 %define       V_slony1_major    1.2
-%define       V_slony1_minor    21
+%define       V_slony1_minor    23
 %define       V_pgcluster       1.9.0rc5
 %define       V_pgcluster_dir   1706
 %define       V_mysqlcompat     1.0b3
@@ -48,7 +48,7 @@
 Group:        Database
 License:      GPL
 Version:      %{V_postgresql}
-Release:      20101120
+Release:      20120800
 
 #   package options
 %option       with_server       yes
@@ -57,7 +57,6 @@
 %option       with_odbc         no
 %option       with_jdbc         no
 %option       with_compat       no
-%option       with_tcl          no
 %option       with_slony1       no
 %option       with_pgcluster    no
 %option       with_kerberos     no
@@ -81,10 +80,8 @@
 Patch0:       postgresql.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, flex, bison, gzip
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, flex, bison, gzip
+PreReq:       OpenPKG, openpkg >= 20100101
 BuildPreReq:  readline, zlib, openssl, getopt
 PreReq:       readline, zlib, openssl, getopt
 %if "%{with_perl}" == "yes"
@@ -99,10 +96,6 @@
 BuildPreReq:  java, JAVA-JDK, ant
 PreReq:       java, JAVA-JDK
 %endif
-%if "%{with_tcl}" == "yes"
-BuildPreReq:  tcl, tcl::with_x11 = yes, X11
-PreReq:       tcl, tcl::with_x11 = yes, X11
-%endif
 %if "%{with_kerberos}" == "yes"
 BuildPreReq:  KERBEROS
 PreReq:       KERBEROS
@@ -139,7 +132,7 @@
     prog postgresql = {
         version   = %{V_postgresql_dist}
         url       = ftp://ftp.postgresql.org/pub/source/
-        regex     = v(\d+\.\d+(\.\d+)*(?:beta\d*)?)
+        regex     = v(\d+(\.\d+)+)
         url       = ftp://ftp.postgresql.org/pub/source/v__NEWVER__/
         regex     = postgresql-(\d+(\.\d+)+)\.tar\.(bz2|gz)
     }
@@ -249,6 +242,13 @@
     %{l_shtool} subst \
         -e 's;# Shared library stuff;enable_shared = yes;g' \
         src/pl/plpgsql/src/Makefile
+    case "%{l_platform -t}" in
+        *-linux* )
+            %{l_shtool} subst \
+                -e 's;\(printf("%s\)\(\\n", VAL_LIBS\);\1 -lpthread\2;' \
+                src/bin/pg_config/pg_config.c
+            ;;
+    esac
 
 %build
 
@@ -262,10 +262,6 @@
 %if "%{with_slony1}" == "yes"
     CFLAGS="$CFLAGS -pthread"
 %endif
-%if "%{with_tcl}" == "yes"
-    CPPFLAGS="$CPPFLAGS %{l_cppflags tcl}"
-    LDFLAGS="$LDFLAGS -L`%{l_rc} --query x11_libdir`"
-%endif
 %if "%{with_kerberos}" == "yes"
     CPPFLAGS="$CPPFLAGS `krb5-config --cflags`"
     LIBS="$LIBS `krb5-config --libs`"
@@ -289,11 +285,6 @@
         --with-openssl \
         --with-readline \
         --with-zlib \
-%if "%{with_tcl}" == "yes"
-        --with-tcl \
-        --with-tclconfig="%{l_prefix}/lib" \
-        --with-tkconfig="%{l_prefix}/lib" \
-%endif
 %if "%{with_slony1}" == "yes"
         --enable-thread-safety \
 %endif
@@ -311,7 +302,7 @@
         --disable-shared
 
     #   build package
-    %{l_make} %{l_mflags}
+    %{l_make} %{l_mflags -O}
 
     #   build C++ bindings (both old and new one)
 %if "%{with_cxx}" == "yes"
@@ -629,7 +620,6 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
 
 %pre
 %if "%{with_server}" == "yes"
@@ -741,6 +731,7 @@
           echo "                LOCATION '/u/<user>/rdbms';"
           echo "    template1=> CREATE DATABASE <user> OWNER <user>"
           echo "                TABLESPACE <user>;"
+          echo "    template1=> \\q"
           echo "    \$ echo 'localhost:*:<user>:<user>:<password>' >>/u/<user>/.pgpass"
           echo "    \$ chmod 600 <user> /u/<user>/.pgpass"
           echo "    \$ chown <user> /u/<user>/.pgpass"