diff --git a/.cvsignore b/.cvsignore index 9dda70d..dd5bf08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pgpool-II-1.2.tar.gz +pgpool-II-1.2.1.tar.gz diff --git a/pgpool.conf.sample.patch b/pgpool.conf.sample.patch index a5a9baa..275dda3 100644 --- a/pgpool.conf.sample.patch +++ b/pgpool.conf.sample.patch @@ -1,20 +1,13 @@ ---- pgpool.conf.sample.old 2007-08-05 05:27:53.000000000 +0300 -+++ pgpool.conf.sample 2007-08-05 05:29:01.000000000 +0300 -@@ -1,6 +1,5 @@ - # - # pgpool-II configuration file sample --# $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/EL-5/pgpool.conf.sample.patch,v 1.1 2007/08/16 09:22:43 devrim Exp $ - - # Host name or IP address to listen on: '*' for all, '' for no TCP/IP - # connections -@@ -12,16 +11,14 @@ +--- 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. ++# Unix domain socket path. +socket_dir = '/var/run' # Unix domain socket path for pgpool communication manager. @@ -24,12 +17,12 @@ -# 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. ++# 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 +41,7 @@ +@@ -44,7 +42,7 @@ child_max_connections = 0 # Logging directory diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index f0bb1ec..2784526 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -2,12 +2,12 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 1.2 -Release: 4%{?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 @@ -61,7 +61,7 @@ mv %{buildroot}%{_datadir}/%{short_name}/pgpool.pam %{buildroot}%{_datadir}/%{na 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} @@ -69,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 @@ -100,6 +103,13 @@ rm -rf %{buildroot} %{_libdir}/libpcp.so %changelog +* Fri Oct 5 2007 Devrim Gunduz 1.2.1-1 +- Update to 1.2.1 + +* Wed Aug 29 2007 Devrim Gunduz 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 1.2-4 - Fixed the directory name where sample conf files and sql files are installed. diff --git a/sources b/sources index f0d00ef..73d2d85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fed94ed12769dacbbf8758b2154e5a7 pgpool-II-1.2.tar.gz +af2d2024ef1b8776d3145fb9f363d9ba pgpool-II-1.2.1.tar.gz