packages: pgpool/pgpool.spec - adjust default config to sane sockets locati...

[gotar]

Author: gotar                        Date: Mon Jun 29 14:22:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjust default config to sane sockets locations (our postgresql can't do
  this, shame)

---- Files affected:
packages/pgpool:
   pgpool.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/pgpool/pgpool.spec
diff -u packages/pgpool/pgpool.spec:1.19 packages/pgpool/pgpool.spec:1.20
--- packages/pgpool/pgpool.spec:1.19	Mon Jun 29 16:14:39 2009
+++ packages/pgpool/pgpool.spec	Mon Jun 29 16:22:32 2009
@@ -22,7 +22,8 @@
 Source3:	%{relname}.sysconfig
 URL:		http://pgpool.projects.postgresql.org/
 BuildRequires:	postgresql-devel
-%{?with_pam:BuildRequires: pam-devel}
+%{?with_pam:BuildRequires:	pam-devel}
+BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -30,7 +31,7 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-%{?with_pam:Requires: pam}
+%{?with_pam:Requires:	pam}
 Requires:	rc-scripts >= 0.2.0
 Provides:	group(pgpool)
 Provides:	user(pgpool)
@@ -64,6 +65,8 @@
 %prep
 %setup -q
 
+sed -i -e "/socket/ s| = '/tmp'| = '/var/run/pgpool'|" pgpool.conf.sample
+
 %build
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags}"
@@ -79,7 +82,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{sysconfig,monit,pam.d},%{_varrun}/%{name}}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{sysconfig,monit,pam.d},%{_varrun}/pgpool}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -130,7 +133,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pool_hba.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{relname}
 %{_mandir}/man8/pgpool.8*
-%dir %attr(775,root,pgpool) %{_varrun}/%{name}
+%dir %attr(775,root,pgpool) %{_varrun}/pgpool
 %if %{with pam}
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/pgpool
 %endif
@@ -145,6 +148,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2009/06/29 14:22:32  gotar
+- adjust default config to sane sockets locations (our postgresql can't do
+  this, shame)
+
 Revision 1.19  2009/06/29 14:14:39  gotar
 - fixed pidfile location into self-managed /var/run/pgpool/
 - remove subsys lock unconditionally on service stop
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pgpool/pgpool.spec?r1=1.19&r2=1.20&f=u