OpenPKG Specs: comparison postgresql/postgresql.spec

-:c70c3d5bb969
+:88bd44dab8ed
 ##
 ##  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
 ##  the above copyright notice and this permission notice appear in all
 ##  copies.
 ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ##  SUCH DAMAGE.
 ##
 #   package versions
-%define       V_postgresql      9.0.0
+%define       V_postgresql      9.1.4
-%define       V_postgresql_dist 9.0.0
+%define       V_postgresql_dist 9.1.4
-%define       V_postgresql_dir  9.0.0
+%define       V_postgresql_dir  9.1.4
-%define       V_libpqxx         3.1
+%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
 %define       V_mysqlcompat_dir 548
 Distribution: OpenPKG Community
 Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_postgresql}
-Release:      20101120
+Release:      20120800
 #   package options
 %option       with_server       yes
 %option       with_cxx          no
 %option       with_perl         no
 %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
 %option       with_mysqlcompat  no
 %option       with_xml          no
 Source9:      pg_migrate
 Source10:     pg_passwd
 Patch0:       postgresql.patch
 #   build information
-Prefix:       %{l_prefix}
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, flex, bison, gzip
-BuildRoot:    %{l_buildroot}
+PreReq:       OpenPKG, openpkg >= 20100101
-BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, flex, bison, gzip
-PreReq:       OpenPKG, openpkg >= 20060823
 BuildPreReq:  readline, zlib, openssl, getopt
 PreReq:       readline, zlib, openssl, getopt
 %if "%{with_perl}" == "yes"
 BuildPreReq:  perl >= %{V_perl}, perl-openpkg >= %{V_perl}-20061013
 PreReq:       perl >= %{V_perl}
 PreReq:       unixodbc
 %endif
 %if "%{with_jdbc}" == "yes"
 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
 %endif
 %track
 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)
 }
 prog postgresql:libpqxx = {
 version   = %{V_libpqxx}
 contrib/uuid-ossp/Makefile
 %endif
 %{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
 #   configure package
 echo "ac_cv_func_isinf=no" >config.cache
 export CPPFLAGS="%{l_cppflags readline}"
 export LDFLAGS="%{l_ldflags}"
 export LIBS=""
 %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`"
 %endif
 --sysconfdir=%{l_prefix}/etc/postgresql \
 --includedir=%{l_prefix}/include/postgresql \
 --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
 %if "%{with_kerberos}" == "yes"
 --with-krb5 \
 --with-ossp-uuid \
 %endif
 --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"
 ln -s `pwd`/src/interfaces/libpq/*.h src/include/
 ( cd libpqxx-%{V_libpqxx}
 %endif
 %files -f files
 %clean
-rm -rf $RPM_BUILD_ROOT
 %pre
 %if "%{with_server}" == "yes"
 #   before upgrade, check migration dump, save status and stop service
 [ $1 -eq 2 ] || exit 0
 echo "                NOCREATEDB NOCREATEROLE;"
 echo "    template1=> CREATE TABLESPACE <user> OWNER <user>"
 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"
 echo "After this the user <user> will be able to connect to his RDBMS with:"
 echo "    \$ $RPM_INSTALL_PREFIX/bin/psql"

OpenPKG Specs / file comparison

comparison: postgresql/postgresql.spec

postgresql/postgresql.spec