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: 12-Oct-2005 17:53:10
Branch: OPENPKG_2_5_SOLID Handle: 2005101216530900
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/postgresql postgresql.spec rc.postgresql
Log:
MFC: remove pgpool from postgresql package, it now lives in its own
package
Summary:
Revision Changes Path
1.167.2.2 +7 -47 openpkg-src/postgresql/postgresql.spec
1.18.6.1 +0 -11 openpkg-src/postgresql/rc.postgresql
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.167.2.1 -r1.167.2.2 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 11 Oct 2005 12:51:35 -0000
1.167.2.1
+++ openpkg-src/postgresql/postgresql.spec 12 Oct 2005 15:53:09 -0000
1.167.2.2
@@ -29,7 +29,6 @@
%define V_pgperl 2.0.2
%define V_psqlodbc 08.00.0102
%define V_slony1 1.1.1
-%define V_pgpool 2.6.3
%define V_pgcluster 1.3.0c
# package information
@@ -53,7 +52,6 @@
%option with_compat no
%option with_tcl no
%option with_slony1 no
-%option with_pgpool no
%option with_pgcluster no
# list of sources
@@ -63,10 +61,9 @@
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/426/pgpool-%{V_pgpool}.tar.gz
-Source7:
http://pgfoundry.org/frs/download.php/219/pgcluster-%{V_pgcluster}-patch.tar.gz
-Source8: rc.postgresql
-Source9: pg_migrate
+Source6:
http://pgfoundry.org/frs/download.php/219/pgcluster-%{V_pgcluster}-patch.tar.gz
+Source7: rc.postgresql
+Source8: pg_migrate
Patch0: postgresql.patch
# build information
@@ -135,17 +132,11 @@
url = http://developer.postgresql.org/~wieck/slony1/download/
regex = slony1-(\d+\.\d+\.\d+)\.tar\.bz2
}
- prog postgresql:pgpool = {
- version = %{V_pgpool}
- url = http://pgpool.projects.postgresql.org/
- regex = pgpool-(__VER__)\.tar\.gz
- comment = "steve: beside the filename also the url hat to be
changed to download the current version"
- }
prog postgresql:pgcluster = {
+ comment = "steve: beside the filename also the url hat to be
changed to download the current version"
version = %{V_pgcluster}
url = http://pgfoundry.org/frs/?group_id=1000072&release_id=168
regex = pgcluster-(__VER__)-patch\.tar\.gz
- comment = "steve: beside the filename also the url hat to be
changed to download the current version"
}
%prep
@@ -176,11 +167,8 @@
%if "%{with_slony1}" == "yes"
%setup -q -T -D -a 5
%endif
-%if "%{with_pgpool}" == "yes"
- %setup -q -T -D -a 6
-%endif
%if "%{with_pgcluster}" == "yes"
- %setup -q -T -D -a 7
+ %setup -q -T -D -a 6
cat pgcluster-*-patch | \
sed -e 's;\($.exec_prefix./etc\);\1/postgresql;' \
-e '/preproc\.c/,/Makefile\.aix/d' | \
@@ -352,21 +340,6 @@
) || exit $?
%endif
- # build pgpool frontend
-%if "%{with_pgpool}" == "yes"
- ( cd pgpool-%{V_pgpool}
- export CC="%{l_cc}"
- export CFLAGS="%{l_cflags -O} %{l_cppflags}"
- export LDFLAGS="%{l_ldflags}"
- export LIBS="-lgetopt"
- ./configure \
- --prefix=%{l_prefix} \
- --sysconfdir=%{l_prefix}/etc/postgresql \
- --with-pgsrc=/dummy
- %{l_make} %{l_mflags}
- ) || exit $?
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -403,7 +376,7 @@
# create additional directories
%{l_shtool} mkdir -f -p -m 755 \
-%if "%{with_slony1}" == "yes" || "%{with_pgpool}" == "yes" ||
"%{with_pgcluster}" == "yes"
+%if "%{with_slony1}" == "yes" || "%{with_pgcluster}" == "yes"
$RPM_BUILD_ROOT%{l_prefix}/etc/postgresql \
%endif
$RPM_BUILD_ROOT%{l_prefix}/var/postgresql/db \
@@ -496,19 +469,6 @@
) || exit $?
%endif
- # install pgpool frontend
-%if "%{with_pgpool}" == "yes"
- ( cd pgpool-%{V_pgpool}
- %{l_shtool} install -c -s -m 755 \
- pgpool $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 644 \
- -e "s;\(socket_dir = \).*;\1'%{l_prefix}/var/postgresql/run';" \
- -e "s;\(backend_socket_dir =
\).*;\1'%{l_prefix}/var/postgresql/run';" \
- -e "s;\(logdir = \).*;\1'%{l_prefix}/var/postgresql/run';" \
- pgpool.conf.sample
$RPM_BUILD_ROOT%{l_prefix}/etc/postgresql/pgpool.conf
- ) || exit $?
-%endif
-
%if "%{with_pgcluster}" == "yes"
# post-adjust pgcluster configuration filenames
mv $RPM_BUILD_ROOT%{l_prefix}/etc/postgresql/pglb.conf.sample \
@@ -545,7 +505,7 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%if "%{with_server}" == "yes"
%{l_files_std} `cat perl-openpkg-files` \
-%if "%{with_slony1}" == "yes" || "%{with_pgpool}" == "yes" ||
"%{with_pgcluster}" == "yes"
+%if "%{with_slony1}" == "yes" || "%{with_pgcluster}" == "yes"
'%config %{l_prefix}/etc/postgresql/*' \
%endif
'%attr(700,%{l_rusr},%{l_rgrp}) %dir %{l_prefix}/var/postgresql/db' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/rc.postgresql
============================================================================
$ cvs diff -u -r1.18 -r1.18.6.1 rc.postgresql
--- openpkg-src/postgresql/rc.postgresql 18 Jan 2005 11:54:47 -0000
1.18
+++ openpkg-src/postgresql/rc.postgresql 12 Oct 2005 15:53:09 -0000
1.18.6.1
@@ -16,7 +16,6 @@
postgresql_log_minsize="1M"
postgresql_log_complevel="9"
postgresql_slony1="no"
- postgresql_pgpool="no"
%common
postgresql_opts="-h $postgresql_socket_inet -k $postgresql_socket_unix"
@@ -58,9 +57,6 @@
if rcVarIsYes postgresql_slony1; then
postgresql_slony1_start
fi
- if rcVarIsYes postgresql_pgpool; then
- @l_prefix@/bin/pgpool
- fi
%stop -p 600 -u @l_rusr@
rcService postgresql enable yes || exit 0
@@ -69,9 +65,6 @@
if rcVarIsYes postgresql_slony1; then
postgresql_slony1_stop
fi
- if rcVarIsYes postgresql_pgpool; then
- @l_prefix@/bin/pgpool stop
- fi
%restart -p 400 -u @l_rusr@
rcService postgresql enable yes || exit 0
@@ -81,10 +74,6 @@
postgresql_slony1_stop
postgresql_slony1_start
fi
- if rcVarIsYes postgresql_pgpool; then
- @l_prefix@/bin/pgpool stop
- @l_prefix@/bin/pgpool
- fi
%reload -p 400 -u @l_rusr@
rcService postgresql enable yes || exit 0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
