Update pgpool-II to 1.2.1

installed.

.cvsignore

@@ -1 +1 @@
-pgpool-II-1.2.tar.gz
+pgpool-II-1.2.1.tar.gz

pgpool.conf.sample.patch

@@ -0,0 +1,33 @@
+--- pgpool.conf.sample.old	2007-10-05 17:16:23.000000000 -0700
++++ pgpool.conf.sample	2007-10-05 17:18:11.000000000 -0700
+@@ -12,16 +12,14 @@
+ # Port number for pgpool communication manager
+ pcp_port = 9898
+ 
+-# Unix domain socket path.  (The Debian package defaults to
+-# /var/run/postgresql.)
+-socket_dir = '/tmp'
++# Unix domain socket path.
++socket_dir = '/var/run'
+ 
+ # Unix domain socket path for pgpool communication manager.
+-# (Debian package defaults to /var/run/postgresql)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/var/run'
+ 
+-# Unix domain socket path for the backend. Debian package defaults to /var/run/postgresql!
+-backend_socket_dir = '/tmp'
++# Unix domain socket path for the backend.
++backend_socket_dir = '/var/run'
+ 
+ # pgpool communication manager timeout. 0 means no timeout, but strongly not recommended!
+ pcp_timeout = 10
+@@ -44,7 +42,7 @@
+ child_max_connections = 0
+ 
+ # Logging directory
+-logdir = '/tmp'
++logdir = '/var/run'
+ 
+ # Replication mode
+ replication_mode = false

postgresql-pgpool-II.spec

@@ -2,14 +2,15 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	1.2
-Release:	2%{?dist}
+Version:	1.2.1
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
-Source0:	http://pgfoundry.org/frs/download.php/1419/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/1472/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
+Patch1:		pgpool.conf.sample.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel pam-devel
 
@@ -43,6 +44,7 @@ Development headers and libraries for pgpool-II.
 
 %prep
 %setup -q -n %{short_name}-%{version}
+%patch1 -p0
 
 %build
 %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath
@@ -52,11 +54,14 @@ make %{?_smp_flags}
 %install
 rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
-mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_name}
+install -d %{buildroot}%{_datadir}/%{name}
+mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{name}
+mv %{buildroot}%{_datadir}/%{short_name}/system_db.sql %{buildroot}%{_datadir}/%{name}
+mv %{buildroot}%{_datadir}/%{short_name}/pgpool.pam %{buildroot}%{_datadir}/%{name}
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
-install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/pgpool
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/pgpool
 
 # nuke libtool archive and static lib
 rm -f %{buildroot}%{_libdir}/libpcp.{a,la}
@@ -64,7 +69,10 @@ rm -f %{buildroot}%{_libdir}/libpcp.{a,la}
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post 
+/sbin/ldconfig
+chkconfig --add pgpool
+
 %postun -p /sbin/ldconfig
 
 %files
@@ -81,10 +89,10 @@ rm -rf %{buildroot}
 %{_bindir}/pcp_systemdb_info
 %{_bindir}/pg_md5
 %{_mandir}/man8/pgpool*
-%{_datadir}/%{short_name}/system_db.sql
+%{_datadir}/%{name}/system_db.sql
 %{_libdir}/libpcp.so.*
-%attr(764,root,apache) %{_datadir}/%{short_name}/*.conf.sample
-%{_datadir}/%{short_name}/pgpool.pam
+%attr(764,root,apache) %{_datadir}/%{name}/*.conf.sample
+%{_datadir}/%{name}/pgpool.pam
 %{_initrddir}/pgpool
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
@@ -95,6 +103,20 @@ rm -rf %{buildroot}
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Oct 5 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2.1-1
+- Update to 1.2.1
+
+* Wed Aug 29 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-5
+- Chmod sysconfig/pgpool to 644, not 755. Per BZ review.
+- Run chkconfig --add pgpool during %%post.
+
+* Thu Aug 16 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-4
+- Fixed the directory name where sample conf files and sql files 
+  are installed.
+
+* Sun Aug 5 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-3
+- Added a patch for sample conf file to use Fedora defaults
+
 * Sun Aug 5 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-2
 - Added an init script for pgpool
 - Added /etc/sysconfig/pgpool

sources

@@ -1 +1 @@
-8fed94ed12769dacbbf8758b2154e5a7  pgpool-II-1.2.tar.gz
+af2d2024ef1b8776d3145fb9f363d9ba  pgpool-II-1.2.1.tar.gz