OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 11-Aug-2009 20:25:42
Branch: HEAD Handle: 2009081119254101
Added files:
openpkg-src/pgpool pgpool.patch
Modified files:
openpkg-src/pgpool pgpool.spec
Log:
upgrade to pgpool II
Summary:
Revision Changes Path
1.1 +12 -0 openpkg-src/pgpool/pgpool.patch
1.32 +32 -30 openpkg-src/pgpool/pgpool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pgpool/pgpool.patch
============================================================================
$ cvs diff -u -r0 -r1.1 pgpool.patch
--- /dev/null 2009-08-11 20:25:41 +0200
+++ pgpool.patch 2009-08-11 20:25:42 +0200
@@ -0,0 +1,12 @@
+Index: Makefile.in
+--- Makefile.in.orig 2007-11-21 11:14:16 +0100
++++ Makefile.in 2007-12-15 10:29:38 +0100
+@@ -18,7 +18,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/pgpool
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgpool/pgpool.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 pgpool.spec
--- openpkg-src/pgpool/pgpool.spec 18 Apr 2009 13:14:13 -0000 1.31
+++ openpkg-src/pgpool/pgpool.spec 11 Aug 2009 18:25:42 -0000 1.32
@@ -22,8 +22,9 @@
##
# package versions
-%define V_pgpool 3.4.1
-%define V_pgpool_dir 1446
+%define V_openpkg 2.2.3
+%define V_pgpool 2.2.3
+%define V_pgpool_dir 2329
# package information
Name: pgpool
@@ -35,20 +36,21 @@
Class: PLUS
Group: Database
License: GPL
-Version: %{V_pgpool}
-Release: 20080101
+Version: %{V_openpkg}
+Release: 20090811
# list of sources
-Source0:
http://pgfoundry.org/frs/download.php/%{V_pgpool_dir}/pgpool-%{V_pgpool}.tar.gz
+Source0:
http://pgfoundry.org/frs/download.php/%{V_pgpool_dir}/pgpool-II-%{V_pgpool}.tar.gz
Source1: rc.pgpool
+Patch0: pgpool.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: getopt
-PreReq: getopt
+BuildPreReq: postgresql, openssl, getopt
+PreReq: postgresql, openssl, getopt
AutoReq: no
AutoReqProv: no
@@ -66,12 +68,13 @@
prog pgpool = {
version = %{V_pgpool_dir}-%{V_pgpool}
url = http://pgfoundry.org/frs/?group_id=1000055
- regex = /(\d+/pgpool-__VER__)\.tar\.gz
- transform = "s/^(\\d+)\/pgpool-(\d+(\.\d+)+)/$1-$2/; $_"
+ regex = /(\d+/pgpool-II-__VER__)\.tar\.gz
+ transform = "s/^(\\d+)\/pgpool-II-(\d+(\.\d+)+)/$1-$2/; $_"
}
%prep
- %setup -q -n pgpool-%{V_pgpool}
+ %setup -q -n pgpool-II-%{V_pgpool}
+ %patch -p0
%build
# configure program
@@ -79,47 +82,46 @@
CFLAGS="%{l_cflags -O} %{l_cppflags}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
- LIBS="-lgetopt" \
+ LIBS="-lgetopt -lssl -lcrypto -lcrypt" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--sysconfdir=%{l_prefix}/etc/pgpool \
- --with-pgsrc=/dummy
+ --with-pgsrc=/dummy \
+ --disable-shared
# build program
%{l_make} %{l_mflags -O}
%install
- # create installation hierarchy
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool \
- $RPM_BUILD_ROOT%{l_prefix}/var/pgpool \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
- $RPM_BUILD_ROOT%{l_prefix}/man/cat8
# install program
- %{l_shtool} install -c -s -m 755 \
- pgpool $RPM_BUILD_ROOT%{l_prefix}/sbin/
-
- # install documentation
- %{l_shtool} install -c -m 644 \
- pgpool.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
- %{l_shtool} install -c -m 644 \
- README $RPM_BUILD_ROOT%{l_prefix}/man/cat8/pgpool_readme.8
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
# install default configuration
- %{l_shtool} install -c -m 644 \
+ mv $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pcp.conf.sample \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pcp.conf
+ mv $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pgpool.conf.sample \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pgpool.conf
+ mv $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pool_hba.conf.sample \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pool_hba.conf
+ %{l_shtool} subst \
-e 's;\(logdir = .\).*\(.\)$;\1%{l_prefix}/var/pgpool\2;' \
-e 's;\(socket_dir = .\).*\(.\)$;\1%{l_prefix}/var/pgpool\2;' \
-e 's;\(backend_socket_dir =
.\).*\(.\)$;\1%{l_prefix}/var/postgresql/run\2;' \
- pgpool.conf.sample $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pgpool.conf
+ $RPM_BUILD_ROOT%{l_prefix}/etc/pgpool/pgpool.conf
# install run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.pgpool} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ # create run-time directory
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/pgpool
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
