OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jan-2007 21:23:13
Branch: HEAD Handle: 2007010620231300
Modified files:
openpkg-src/postgresql82
postgresql82.spec
Log:
upgrade to 8.2.1 and resync with postgresql package
Summary:
Revision Changes Path
1.14 +18 -18 openpkg-src/postgresql82/postgresql82.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql82/postgresql82.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 postgresql82.spec
--- openpkg-src/postgresql82/postgresql82.spec 6 Jan 2007 09:48:12
-0000 1.13
+++ openpkg-src/postgresql82/postgresql82.spec 6 Jan 2007 20:23:13
-0000 1.14
@@ -25,10 +25,10 @@
# FIXME: rse: pgcluster patch still does not link correctly
# package versions
-%define V_postgresql_base 8.2
-%define V_postgresql_pl 0
+%define V_postgresql 8.2.1
%define V_libpqpp 4.0
%define V_libpqxx 2.5.5
+%define V_perl 5.8.8
%define V_pgperl 2.0.2
%define V_psqlodbc 08.02.0200
%define V_slony1 1.2.5
@@ -48,7 +48,7 @@
Class: BASE
Group: Database
License: GPL
-Version: %{V_postgresql_base}.%{V_postgresql_pl}
+Version: %{V_postgresql}
Release: 20070106
# package options
@@ -66,7 +66,7 @@
%option with_setproctitle no
# list of sources
-Source0:
ftp://ftp.postgresql.org/pub/source/v%{V_postgresql_base}/postgresql-%{V_postgresql_base}.%{V_postgresql_pl}.tar.bz2
+Source0:
ftp://ftp.postgresql.org/pub/source/v%{V_postgresql}/postgresql-%{V_postgresql}.tar.bz2
Source1:
ftp://gborg.postgresql.org/pub/libpqpp/stable/libpq++-%{V_libpqpp}.tar.gz
Source2:
ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-%{V_libpqxx}.tar.gz
Source3:
ftp://gborg.postgresql.org/pub/pgperl/stable/pgperl-%{V_pgperl}.tar.gz
@@ -86,8 +86,8 @@
BuildPreReq: readline, zlib, openssl, getopt
PreReq: readline, zlib, openssl, getopt
%if "%{with_perl}" == "yes"
-BuildPreReq: perl, perl-openpkg >= 5.8.3-20040126
-PreReq: perl
+BuildPreReq: perl >= %{V_perl}, perl-openpkg >= %{V_perl}-20061013
+PreReq: perl >= %{V_perl}
%endif
%if "%{with_odbc}" == "yes"
BuildPreReq: unixodbc
@@ -129,7 +129,7 @@
%track
prog postgresql82 = {
- version = %{V_postgresql_base}.%{V_postgresql_pl}
+ version = %{V_postgresql}
url = ftp://ftp.postgresql.org/pub/source/
regex = v(8\.2(\.\d+)*)
url = ftp://ftp.postgresql.org/pub/source/v__NEWVER__/
@@ -175,11 +175,11 @@
}
%prep
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl}
+ %setup -q -n postgresql-%{V_postgresql}
%patch -p0
%if "%{with_cxx}" == "yes"
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl} -T -D -a
1
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl} -T -D -a
2
+ %setup -q -n postgresql-%{V_postgresql} -T -D -a 1
+ %setup -q -n postgresql-%{V_postgresql} -T -D -a 2
case "%{l_platform -t}" in
*-sunos* )
%{l_shtool} subst \
@@ -200,22 +200,22 @@
libpqxx-%{V_libpqxx}/configure
%endif
%if "%{with_perl}" == "yes"
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl} -T -D -a
3
+ %setup -q -n postgresql-%{V_postgresql} -T -D -a 3
%endif
%if "%{with_odbc}" == "yes"
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl} -T -D -a
4
+ %setup -q -n postgresql-%{V_postgresql} -T -D -a 4
%endif
%if "%{with_slony1}" == "yes"
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl} -T -D -a
5
+ %setup -q -n postgresql-%{V_postgresql} -T -D -a 5
%endif
%if "%{with_pgcluster}" == "yes"
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl} -T -D -a
6
+ %setup -q -n postgresql-%{V_postgresql} -T -D -a 6
sed -e '/^diff.*libpq\.rc/,/^diff/d' pgcluster-*-patch |\
sed -e 's;(char .)\(ptr .= readlen\);\1;' |\
%{l_patch} -p1
%endif
%if "%{with_mysqlcompat}" == "yes"
- %setup -q -n postgresql-%{V_postgresql_base}.%{V_postgresql_pl} -T -D -a
7
+ %setup -q -n postgresql-%{V_postgresql} -T -D -a 7
%endif
%if "%{with_kerberos}" == "yes"
%{l_shtool} subst \
@@ -250,7 +250,7 @@
) >config.cache
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
- export CPPFLAGS="%{l_cppflags readline}
-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
+ export CPPFLAGS="%{l_cppflags readline}"
export LDFLAGS="%{l_ldflags}"
export LIBS=""
%if "%{with_slony1}" == "yes"
@@ -616,7 +616,7 @@
# database migration dumping hint
v_old_all=`cat $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION`
v_old_maj=`echo "$v_old_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
- v_new_all="%{V_postgresql_base}.%{V_postgresql_pl}"
+ v_new_all="%{V_postgresql}"
v_new_maj=`echo "$v_new_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
if [ ".$v_old_maj" != ".$v_new_maj" ]; then
if [ ! -f $RPM_INSTALL_PREFIX/var/postgresql/db.dump.sql.bz2 -a
".$RPM_POSTGRESQL_MIGRATE" != .ignore ]; then
@@ -723,7 +723,7 @@
# database migration restoring hint
v_old_all=`cat $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION`
v_old_maj=`echo "$v_old_all" | sed -e
's/^\([0-9]*\.[0-9]*\).*/\1/'`
- v_new_all="%{V_postgresql_base}.%{V_postgresql_pl}"
+ v_new_all="%{V_postgresql}"
v_new_maj=`echo "$v_new_all" | sed -e
's/^\([0-9]*\.[0-9]*\).*/\1/'`
if [ ".$v_old_maj" != ".$v_new_maj" ]; then
( echo "You upgraded from PostgreSQL $v_old_all to
PostgresSQL $v_new_all,"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
