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: 09-Jan-2006 21:46:33
Branch: HEAD Handle: 2006010920463200
Modified files:
openpkg-src/postgresql postgresql.spec
Log:
fix PGCluster support by upgrading to latest patch
Summary:
Revision Changes Path
1.181 +7 -10 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.180 -r1.181 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 6 Jan 2006 14:27:10 -0000
1.180
+++ openpkg-src/postgresql/postgresql.spec 9 Jan 2006 20:46:32 -0000
1.181
@@ -22,8 +22,6 @@
## SUCH DAMAGE.
##
-# FIXME: rse: pgcluster no longer applies after PostgreSQL 8.1 upgrade
-
# package versions
%define V_postgresql 8.1.2
%define V_libpqpp 4.0
@@ -31,7 +29,7 @@
%define V_pgperl 2.0.2
%define V_psqlodbc 08.01.0102
%define V_slony1 1.1.2
-%define V_pgcluster 1.3.0c
+%define V_pgcluster 1.5.0rc2
%define V_mysqlcompat 1.0b3
# package information
@@ -45,7 +43,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 20060106
+Release: 20060109
# package options
%option with_server yes
@@ -66,7 +64,7 @@
Source3:
ftp://gborg.postgresql.org/pub/pgperl/stable/pgperl-%{V_pgperl}.tar.gz
Source4:
ftp://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{V_psqlodbc}.tar.gz
Source5:
http://developer.postgresql.org/~wieck/slony1/download/slony1-%{V_slony1}.tar.bz2
-Source6:
http://pgfoundry.org/frs/download.php/219/pgcluster-%{V_pgcluster}-patch.tar.gz
+Source6:
http://pgfoundry.org/frs/download.php/598/pgcluster-%{V_pgcluster}-patch.tar.gz
Source7:
http://pgfoundry.org/frs/download.php/548/mysqlcompat-%{V_pgcluster}.tar.gz
Source8: rc.postgresql
Source9: pg_migrate
@@ -186,9 +184,8 @@
%endif
%if "%{with_pgcluster}" == "yes"
%setup -q -T -D -a 6
- cat pgcluster-*-patch | \
- sed -e 's;\($.exec_prefix./etc\);\1/postgresql;' \
- -e '/preproc\.c/,/Makefile\.aix/d' | \
+ cat pgcluster-*-patch |\
+ sed -e 's;(char .)\(ptr .= readlen\);\1;' |\
%{l_patch} -p1
%endif
%if "%{with_mysqlcompat}" == "yes"
@@ -502,9 +499,9 @@
# post-adjust pgcluster configuration filenames
%if "%{with_pgcluster}" == "yes"
- mv $RPM_BUILD_ROOT%{l_prefix}/etc/postgresql/pglb.conf.sample \
+ cp $RPM_BUILD_ROOT%{l_prefix}/share/postgresql/pglb.conf.sample \
$RPM_BUILD_ROOT%{l_prefix}/etc/postgresql/pglb.conf
- mv $RPM_BUILD_ROOT%{l_prefix}/etc/postgresql/pgreplicate.conf.sample \
+ cp $RPM_BUILD_ROOT%{l_prefix}/share/postgresql/pgreplicate.conf.sample \
$RPM_BUILD_ROOT%{l_prefix}/etc/postgresql/pgreplicate.conf
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
