From 64d312350e3c492da33a0014f4346d816fd9e8dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 5 Aug 2007 02:52:20 +0000
Subject: [PATCH 01/33] Patch for sample conf file

---
 pgpool.conf.sample.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pgpool.conf.sample.patch

diff --git a/pgpool.conf.sample.patch b/pgpool.conf.sample.patch
new file mode 100644
index 0000000..c97eac1
--- /dev/null
+++ b/pgpool.conf.sample.patch
@@ -0,0 +1,40 @@
+--- 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/F-10/pgpool.conf.sample.patch,v 1.1 2007/08/05 02:52:20 devrim Exp $
+ 
+ # Host name or IP address to listen on: '*' for all, '' for no TCP/IP
+ # connections
+@@ -12,16 +11,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 +41,7 @@
+ child_max_connections = 0
+ 
+ # Logging directory
+-logdir = '/tmp'
++logdir = '/var/run'
+ 
+ # Replication mode
+ replication_mode = false

From 6dba2d379073c694e6338f145f708006e8a6b90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 5 Aug 2007 02:58:47 +0000
Subject: [PATCH 02/33] - Added a patch for sample conf file to use Fedora
 defaults

---
 postgresql-pgpool-II.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 81a10a4..5f657bd 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -10,6 +10,7 @@ URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
 Source0:	http://pgfoundry.org/frs/download.php/1419/%{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
@@ -98,6 +100,7 @@ rm -rf %{buildroot}
 * Sun Aug 5 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-2
 - Added an init script for pgpool
 - Added /etc/sysconfig/pgpool
+- Added a patch for sample conf file to use Fedora defaults
 
 * Wed Aug 1 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-1
 - Update to 1.2

From dfcca775076c3a8c3720df8bef07d2d815f42719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 5 Aug 2007 03:03:11 +0000
Subject: [PATCH 03/33] Bump up version

---
 postgresql-pgpool-II.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 5f657bd..c440570 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	1.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
@@ -97,10 +97,12 @@ rm -rf %{buildroot}
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
-- Added a patch for sample conf file to use Fedora defaults
 
 * Wed Aug 1 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-1
 - Update to 1.2

From c280173ff823725e1266b1dfe796898a28e871e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Thu, 16 Aug 2007 08:41:21 +0000
Subject: [PATCH 04/33] - Fixed the directory name where sample conf files and
 sql files are     installed.

---
 postgresql-pgpool-II.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index c440570..bdd5221 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	1.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
@@ -54,7 +54,7 @@ make %{?_smp_flags}
 %install
 rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
-mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_name}
+mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{name}
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -83,10 +83,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
 
@@ -97,6 +97,10 @@ rm -rf %{buildroot}
 %{_libdir}/libpcp.so
 
 %changelog
+* 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
 

From 7044c08f20df79329c2b235113edadd2a318facb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Thu, 16 Aug 2007 09:44:57 +0000
Subject: [PATCH 05/33] Update spec file per latest changes.

---
 postgresql-pgpool-II.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index bdd5221..f0bb1ec 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -54,7 +54,10 @@ make %{?_smp_flags}
 %install
 rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
+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

From b6ad05e178947614202ab912a19f6900e257988a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sat, 6 Oct 2007 00:25:06 +0000
Subject: [PATCH 06/33] Update pgpool-II to 1.2.1

---
 .cvsignore                |  2 +-
 pgpool.conf.sample.patch  | 19 ++++++-------------
 postgresql-pgpool-II.spec | 20 +++++++++++++++-----
 sources                   |  2 +-
 4 files changed, 23 insertions(+), 20 deletions(-)

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 c97eac1..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/F-10/pgpool.conf.sample.patch,v 1.1 2007/08/05 02:52:20 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 <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.
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

From d3a8616eb24064be490f5d3d4b46f10c67e5bff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Tue, 23 Oct 2007 06:47:13 +0000
Subject: [PATCH 07/33] Update pgpool-II to 1.3

---
 .cvsignore                | 2 +-
 postgresql-pgpool-II.spec | 7 +++++--
 sources                   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index dd5bf08..fe50d07 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-1.2.1.tar.gz
+pgpool-II-1.3.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 2784526..f5f9c61 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.1
+Version:	1.3
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
-Source0:	http://pgfoundry.org/frs/download.php/1472/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/1488/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -103,6 +103,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Oct 23 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.3-1
+- Update to 1.3
+
 * Fri Oct 5 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2.1-1
 - Update to 1.2.1
 
diff --git a/sources b/sources
index 73d2d85..b2c5487 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af2d2024ef1b8776d3145fb9f363d9ba  pgpool-II-1.2.1.tar.gz
+1276c4b98a9de6f85f3179380a370144  pgpool-II-1.3.tar.gz

From c8e17697fa0258207c389fd971c66206715cbe0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sat, 5 Jan 2008 20:59:45 +0000
Subject: [PATCH 08/33] Update to 2.0.1 release

---
 .cvsignore                | 2 +-
 postgresql-pgpool-II.spec | 8 ++++++--
 sources                   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index fe50d07..797f93b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-1.3.tar.gz
+pgpool-II-2.0.1.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index f5f9c61..c2ea3e9 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.3
+Version:	2.0.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/1488/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/1521/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -85,6 +85,7 @@ chkconfig --add pgpool
 %{_bindir}/pcp_node_info
 %{_bindir}/pcp_proc_count
 %{_bindir}/pcp_proc_info
+%{_bindir}/pcp_recovery_node
 %{_bindir}/pcp_stop_pgpool
 %{_bindir}/pcp_systemdb_info
 %{_bindir}/pg_md5
@@ -103,6 +104,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sat Jan 5 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.0.1-1
+- Update to 2.0.1
+
 * Tue Oct 23 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.3-1
 - Update to 1.3
 
diff --git a/sources b/sources
index b2c5487..84948dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1276c4b98a9de6f85f3179380a370144  pgpool-II-1.3.tar.gz
+fdfd023b1400ae85455e8274bf0cb502  pgpool-II-2.0.1.tar.gz

From dadb26b7fdaf1e58ea18672e51d04b5727c24000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Mon, 14 Jan 2008 08:24:24 +0000
Subject: [PATCH 09/33] Update to 2.0.1 Add a temp patch that will disappear in
 2.0.2

---
 pool_process_query-2.0.1.patch | 27 +++++++++++++++++++++++++++
 postgresql-pgpool-II.spec      | 21 +++++++++++----------
 2 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 pool_process_query-2.0.1.patch

diff --git a/pool_process_query-2.0.1.patch b/pool_process_query-2.0.1.patch
new file mode 100644
index 0000000..cbe284c
--- /dev/null
+++ b/pool_process_query-2.0.1.patch
@@ -0,0 +1,27 @@
+*** pool_process_query.c	2007/11/21 09:37:39	1.79
+--- pool_process_query.c.old	2007/12/01 13:26:36	1.80
+***************
+*** 1,6 ****
+  /* -*-pgsql-c-*- */
+  /*
+!  * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/F-10/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $
+   *
+   * pgpool: a language independent connection pool server for PostgreSQL 
+   * written by Tatsuo Ishii
+--- 1,6 ----
+  /* -*-pgsql-c-*- */
+  /*
+!  * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/F-10/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $
+   *
+   * pgpool: a language independent connection pool server for PostgreSQL 
+   * written by Tatsuo Ishii
+*************** POOL_STATUS SimpleForwardToBackend(char 
+*** 3895,3901 ****
+  
+  	if (kind == 'S') /* Sync message? */
+  	{
+- 		pool_log("YYYYY");
+  		receive_sync = 1;
+  	}
+  
+--- 3895,3900 ----
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index c2ea3e9..09af754 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -11,6 +11,7 @@ Source0:	http://pgfoundry.org/frs/download.php/1521/%{short_name}-%{version}.tar
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
+Patch4:		pool_process_query-%{version}.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel pam-devel
 
@@ -37,7 +38,7 @@ DB nodes to be connected, which was not possible in pgpool-I.
 %package devel
 Summary:	The  development files for pgpool-II
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{short_name} = %{version}
 
 %description devel
 Development headers and libraries for pgpool-II.
@@ -45,6 +46,7 @@ Development headers and libraries for pgpool-II.
 %prep
 %setup -q -n %{short_name}-%{version}
 %patch1 -p0
+%patch4 -p0
 
 %build
 %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath
@@ -54,10 +56,8 @@ make %{?_smp_flags}
 %install
 rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
-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}%{_datadir}/%{short_name}
+mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_name}
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -85,15 +85,15 @@ chkconfig --add pgpool
 %{_bindir}/pcp_node_info
 %{_bindir}/pcp_proc_count
 %{_bindir}/pcp_proc_info
-%{_bindir}/pcp_recovery_node
 %{_bindir}/pcp_stop_pgpool
+%{_bindir}/pcp_recovery_node
 %{_bindir}/pcp_systemdb_info
 %{_bindir}/pg_md5
 %{_mandir}/man8/pgpool*
-%{_datadir}/%{name}/system_db.sql
+%{_datadir}/%{short_name}/system_db.sql
 %{_libdir}/libpcp.so.*
-%attr(764,root,apache) %{_datadir}/%{name}/*.conf.sample
-%{_datadir}/%{name}/pgpool.pam
+%attr(764,root,apache) %{_datadir}/%{short_name}/*.conf.sample
+%{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
@@ -104,8 +104,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
-* Sat Jan 5 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.0.1-1
+* Sun Jan 13 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.0.1-1
 - Update to 2.0.1
+- Add a temp patch that will disappear in 2.0.2
 
 * Tue Oct 23 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.3-1
 - Update to 1.3

From d741324ebc00f80617c571ffef18696b2b94b610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 20 Jan 2008 00:56:54 +0000
Subject: [PATCH 10/33] Fix Requires of -devel package, per bz#429436

---
 postgresql-pgpool-II.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 09af754..2b10f83 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	2.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
@@ -38,7 +38,7 @@ DB nodes to be connected, which was not possible in pgpool-I.
 %package devel
 Summary:	The  development files for pgpool-II
 Group:		Development/Libraries
-Requires:	%{short_name} = %{version}
+Requires:	%{name} = %{version}
 
 %description devel
 Development headers and libraries for pgpool-II.
@@ -104,6 +104,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sat Jan 19 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.0.1-2
+- Fix Requires of -devel package, per bz#429436
+
 * Sun Jan 13 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.0.1-1
 - Update to 2.0.1
 - Add a temp patch that will disappear in 2.0.2

From 7014fbf5d8ce4eb9a1517becbbf3e5e9c6a9df8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Tue, 22 Jan 2008 03:59:48 +0000
Subject: [PATCH 11/33] - Rebuilt against PostgreSQL 8.3

---
 postgresql-pgpool-II.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 2b10f83..14588fc 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	2.0.1
-Release:	2%{?dist}
+Release:	2%{?dist}.1
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
@@ -104,6 +104,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Mon Jan 21 2008 Devrim GUNDUZ <devrim@commandprompt.com> 2.0.1-2.1
+- Rebuilt against PostgreSQL 8.3
+
 * Sat Jan 19 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.0.1-2
 - Fix Requires of -devel package, per bz#429436
 

From ef6834a2eb235ae862d1247d226aeb9b0a34382e Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 19 Feb 2008 01:27:41 +0000
Subject: [PATCH 12/33] - Autorebuild for GCC 4.3

---
 postgresql-pgpool-II.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 14588fc..a599e93 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	2.0.1
-Release:	2%{?dist}.1
+Release:	3%{?dist}.1
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
@@ -104,6 +104,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.0.1-3.1
+- Autorebuild for GCC 4.3
+
 * Mon Jan 21 2008 Devrim GUNDUZ <devrim@commandprompt.com> 2.0.1-2.1
 - Rebuilt against PostgreSQL 8.3
 

From 18495be631b9e913f53ade6d0a15d757a7ed04d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 6 Apr 2008 16:37:31 +0000
Subject: [PATCH 13/33] Update to 2.1 beta2 Remove unneeded patch.

---
 pool_process_query-2.0.1.patch | 27 ---------------------------
 postgresql-pgpool-II.spec      | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 pool_process_query-2.0.1.patch

diff --git a/pool_process_query-2.0.1.patch b/pool_process_query-2.0.1.patch
deleted file mode 100644
index cbe284c..0000000
--- a/pool_process_query-2.0.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-*** pool_process_query.c	2007/11/21 09:37:39	1.79
---- pool_process_query.c.old	2007/12/01 13:26:36	1.80
-***************
-*** 1,6 ****
-  /* -*-pgsql-c-*- */
-  /*
-!  * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/F-10/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $
-   *
-   * pgpool: a language independent connection pool server for PostgreSQL 
-   * written by Tatsuo Ishii
---- 1,6 ----
-  /* -*-pgsql-c-*- */
-  /*
-!  * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/F-10/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $
-   *
-   * pgpool: a language independent connection pool server for PostgreSQL 
-   * written by Tatsuo Ishii
-*************** POOL_STATUS SimpleForwardToBackend(char 
-*** 3895,3901 ****
-  
-  	if (kind == 'S') /* Sync message? */
-  	{
-- 		pool_log("YYYYY");
-  		receive_sync = 1;
-  	}
-  
---- 3895,3900 ----
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index a599e93..a831769 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -2,16 +2,15 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.0.1
-Release:	3%{?dist}.1
+Version:	2.1
+Release:	beta2%{?dist}.1
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
-Source0:	http://pgfoundry.org/frs/download.php/1521/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/1726/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
-Patch4:		pool_process_query-%{version}.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel pam-devel
 
@@ -38,15 +37,14 @@ DB nodes to be connected, which was not possible in pgpool-I.
 %package devel
 Summary:	The  development files for pgpool-II
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-beta2
 
 %description devel
 Development headers and libraries for pgpool-II.
 
 %prep
-%setup -q -n %{short_name}-%{version}
+%setup -q -n %{short_name}-%{version}-beta2
 %patch1 -p0
-%patch4 -p0
 
 %build
 %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath
@@ -58,6 +56,8 @@ rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
 install -d %{buildroot}%{_datadir}/%{short_name}
 mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_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
@@ -85,8 +85,8 @@ chkconfig --add pgpool
 %{_bindir}/pcp_node_info
 %{_bindir}/pcp_proc_count
 %{_bindir}/pcp_proc_info
-%{_bindir}/pcp_stop_pgpool
 %{_bindir}/pcp_recovery_node
+%{_bindir}/pcp_stop_pgpool
 %{_bindir}/pcp_systemdb_info
 %{_bindir}/pg_md5
 %{_mandir}/man8/pgpool*
@@ -104,6 +104,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sun Apr 6 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-beta2
+- Update to 2.1 beta2
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.0.1-3.1
 - Autorebuild for GCC 4.3
 

From b2746954831d8b575dea91b01e638d845454fdd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 6 Apr 2008 16:53:04 +0000
Subject: [PATCH 14/33] Update sources

---
 .cvsignore | 2 +-
 sources    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 797f93b..4ca0bb8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-2.0.1.tar.gz
+pgpool-II-2.1-beta2.tar.gz
diff --git a/sources b/sources
index 84948dd..61b5efb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdfd023b1400ae85455e8274bf0cb502  pgpool-II-2.0.1.tar.gz
+cb0cc6cc44695224c74d5835cef345b0  pgpool-II-2.1-beta2.tar.gz

From 7cfa2c76686562bbe9ab295702642f1bd62f7f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 6 Apr 2008 16:54:53 +0000
Subject: [PATCH 15/33] Fix spec

---
 postgresql-pgpool-II.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index a831769..717906e 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -7,7 +7,7 @@ Release:	beta2%{?dist}.1
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
-Source0:	http://pgfoundry.org/frs/download.php/1726/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/1726/%{short_name}-%{version}-beta2.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch

From a34f63252fd8119da0305700b17ff89e0c36a0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 6 Apr 2008 17:11:29 +0000
Subject: [PATCH 16/33] Copy-paste is evil.

---
 postgresql-pgpool-II.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 717906e..8f5ae43 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -56,8 +56,6 @@ rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
 install -d %{buildroot}%{_datadir}/%{short_name}
 mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_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

From 296900894e3af25b02e5f44c1afec94170c6e773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Wed, 9 Apr 2008 06:36:47 +0000
Subject: [PATCH 17/33] - Honor /etc/sysconfig/pgpool settings. Previously we
 could never customize     PGPOOLPID=/var/run/pgpool.pid et al. - Remaining
 hardcoded paths replaced by customizable variables such as     $PGPOOLCONF .

---
 pgpool.init | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pgpool.init b/pgpool.init
index 8c96220..89aa399 100755
--- a/pgpool.init
+++ b/pgpool.init
@@ -8,11 +8,12 @@
 #
 # v1.0.0 Devrim GUNDUZ <devrim@CommandPrompt.com>
 # - Initial version of Red Hat / Fedora init script
-
-if [ -r /etc/sysconfig/pgpool ]; then
-    . /etc/sysconfig/pgpool
-fi
-
+# v1.0.1 Devrim GUNDUZ <devrim@CommandPrompt.com>
+# - - Honor /etc/sysconfig/pgpool settings. Previously we could never
+#  customize PGPOOLPID=/var/run/pgpool.pid et al.
+# - Remaining hardcoded paths replaced by customizable variables
+#   such as $PGPOOLCONF .
+ 
 # Source function library.
 INITD=/etc/rc.d/init.d
 . $INITD/functions
@@ -37,16 +38,21 @@ PGPOOLCONF=/etc/pgpool.conf
 PGPOOLPID=/var/run/pgpool.pid
 PGPOOLLOG=/var/log/pgpool.log
 
+# read in the site custom setup
+if [ -r /etc/sysconfig/pgpool ]; then
+    . /etc/sysconfig/pgpool
+fi
+
 test -x $PGPOOLDAEMON || exit 5
 
-# Create the log file if it does not exist
+# Create the pgpool.log log file if it does not exist
 if [ ! -r $PGPOOLLOG ]
 then
 	touch $PGPOOLLOG
 fi
 
-# Check whether the config file exists or not
-if [ ! -r /etc/pgpool.conf ]
+# Check whether the pgpool.conf config file exists or not
+if [ ! -r "$PGPOOLCONF" ]
 then
 	echo "$PGPOOLCONF not found"
 	RETVAL=1
@@ -82,7 +88,7 @@ stop(){
                 RETVAL=1
                 failure
         else
-                killproc /usr/bin/pgpool
+                killproc $PGPOOLDAEMON
                 RETVAL=$?
                 [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${NAME}
         fi;

From 10c888a544515b774a59f711a5917e438ab6fc57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Fri, 11 Apr 2008 18:25:54 +0000
Subject: [PATCH 18/33] - Fix Requires: issue, per #442021 (Alex Lancaster)

---
 postgresql-pgpool-II.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 8f5ae43..f59ec96 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	2.1
-Release:	beta2%{?dist}.1
+Release:	0.2.beta2%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
@@ -37,7 +37,7 @@ DB nodes to be connected, which was not possible in pgpool-I.
 %package devel
 Summary:	The  development files for pgpool-II
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-beta2
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Development headers and libraries for pgpool-II.
@@ -102,6 +102,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Apr 11 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-0.2.beta2
+- Fix Requires: issue, per #442021 (Alex Lancaster)
+
 * Sun Apr 6 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-beta2
 - Update to 2.1 beta2
 

From 455f53b9177806f7f984a65dcc9eb063197c0a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Tue, 12 Aug 2008 05:06:59 +0000
Subject: [PATCH 19/33] - Update to 2.1 Gold - Set group of sample config files
 to root, not apache. Fixes RH #442372.

---
 .cvsignore                |  2 +-
 postgresql-pgpool-II.spec | 12 ++++++++----
 sources                   |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4ca0bb8..4f063bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-2.1-beta2.tar.gz
+pgpool-II-2.1.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index f59ec96..795cd45 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,11 +3,11 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	2.1
-Release:	0.2.beta2%{?dist}
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
-Source0:	http://pgfoundry.org/frs/download.php/1726/%{short_name}-%{version}-beta2.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -43,7 +43,7 @@ Requires:	%{name} = %{version}-%{release}
 Development headers and libraries for pgpool-II.
 
 %prep
-%setup -q -n %{short_name}-%{version}-beta2
+%setup -q -n %{short_name}-%{version}
 %patch1 -p0
 
 %build
@@ -90,7 +90,7 @@ chkconfig --add pgpool
 %{_mandir}/man8/pgpool*
 %{_datadir}/%{short_name}/system_db.sql
 %{_libdir}/libpcp.so.*
-%attr(764,root,apache) %{_datadir}/%{short_name}/*.conf.sample
+%attr(764,root,root) %{_datadir}/%{short_name}/*.conf.sample
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
@@ -102,6 +102,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Aug 12 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-1
+- Update to 2.1 Gold
+- Set group of sample config files to root, not apache. Fixes RH #442372.
+
 * Fri Apr 11 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-0.2.beta2
 - Fix Requires: issue, per #442021 (Alex Lancaster)
 
diff --git a/sources b/sources
index 61b5efb..64b0bb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb0cc6cc44695224c74d5835cef345b0  pgpool-II-2.1-beta2.tar.gz
+cf02f9358f46849bd526798868e13162  pgpool-II-2.1.tar.gz

From b36698166c8526b0057981bab0105a5524fc854f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Tue, 12 Aug 2008 05:34:21 +0000
Subject: [PATCH 20/33] - Update patch #1: Fix build failure caused by new
 default patch fuzz = 0     policy in rawhide

---
 pgpool.conf.sample.patch  | 8 ++++----
 postgresql-pgpool-II.spec | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pgpool.conf.sample.patch b/pgpool.conf.sample.patch
index 275dda3..adc6dee 100644
--- a/pgpool.conf.sample.patch
+++ b/pgpool.conf.sample.patch
@@ -1,5 +1,5 @@
---- pgpool.conf.sample.old	2007-10-05 17:16:23.000000000 -0700
-+++ pgpool.conf.sample	2007-10-05 17:18:11.000000000 -0700
+--- pgpool.conf.sample.old	2008-08-12 08:26:07.000000000 +0300
++++ pgpool.conf.sample	2008-08-12 08:27:31.000000000 +0300
 @@ -12,16 +12,14 @@
  # Port number for pgpool communication manager
  pcp_port = 9898
@@ -22,8 +22,8 @@
  
  # pgpool communication manager timeout. 0 means no timeout, but strongly not recommended!
  pcp_timeout = 10
-@@ -44,7 +42,7 @@
- child_max_connections = 0
+@@ -54,7 +52,7 @@
+ authentication_timeout = 60
  
  # Logging directory
 -logdir = '/tmp'
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 795cd45..bd849ea 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -105,6 +105,8 @@ chkconfig --add pgpool
 * Tue Aug 12 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-1
 - Update to 2.1 Gold
 - Set group of sample config files to root, not apache. Fixes RH #442372.
+- Update patch #1: Fix build failure caused by new default patch
+fuzz = 0 policy in rawhide
 
 * Fri Apr 11 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-0.2.beta2
 - Fix Requires: issue, per #442021 (Alex Lancaster)

From 7250aaa162e4ef1e47bce4f26320b3ec92de2a60 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Fri, 7 Nov 2008 04:05:37 +0000
Subject: [PATCH 21/33] Initialize branch F-10 for postgresql-pgpool-II

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..dc32377
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-10

From fc3f697cedca0c9dae87fffac01738c55643fb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 1 Mar 2009 14:57:56 +0000
Subject: [PATCH 22/33] Update to 2.2

---
 .cvsignore                |  2 +-
 postgresql-pgpool-II.spec | 10 +++++++---
 sources                   |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4f063bc..5ee1445 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-2.1.tar.gz
+pgpool-II-2.2.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index bd849ea..14cf654 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:	2.1
+Version:	2.2
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
-URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
-Source0:	http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz
+URL:		http://pgpool.projects.PostgreSQL.org
+Source0:	http://pgfoundry.org/frs/download.php/2108/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -102,6 +102,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sun Mar 1 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2-1
+- Update to 2.2
+- Fix URL
+
 * Tue Aug 12 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-1
 - Update to 2.1 Gold
 - Set group of sample config files to root, not apache. Fixes RH #442372.
diff --git a/sources b/sources
index 64b0bb8..f978d1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf02f9358f46849bd526798868e13162  pgpool-II-2.1.tar.gz
+3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz

From 8d7c2925b68992603b32178cb507ee32ffd8b44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Mon, 23 Mar 2009 01:00:23 +0000
Subject: [PATCH 23/33] - Fix pid file path in init script. - Fix spec file --
 we don't use short_name macro in pgcore spec file. - Create pgpool pid file
 directory. - Fix stop/start routines, also improve init script a bit. -
 Install conf files to a new directory (/etc/pgpool-II), and get rid of    
 sample conf files.

---
 pgpool.conf.sample.patch  | 37 ++++++++++------
 pgpool.init               | 91 ++++++++++++++++++++++++---------------
 postgresql-pgpool-II.spec | 28 +++++++++---
 3 files changed, 104 insertions(+), 52 deletions(-)

diff --git a/pgpool.conf.sample.patch b/pgpool.conf.sample.patch
index adc6dee..81d10ca 100644
--- a/pgpool.conf.sample.patch
+++ b/pgpool.conf.sample.patch
@@ -1,24 +1,22 @@
---- pgpool.conf.sample.old	2008-08-12 08:26:07.000000000 +0300
-+++ pgpool.conf.sample	2008-08-12 08:27:31.000000000 +0300
+--- pgpool.conf.sample.old	2009-03-22 22:18:52.000000000 +0200
++++ pgpool.conf.sample	2009-03-22 22:46:20.000000000 +0200
 @@ -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.  
+ socket_dir = '/tmp'
  
  # Unix domain socket path for pgpool communication manager.
 -# (Debian package defaults to /var/run/postgresql)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/var/run'
+ pcp_socket_dir = '/tmp'
  
 -# 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'
++# Unix domain socket path for the backend. 
++backend_socket_dir = '/var/run/pgpool'
  
  # pgpool communication manager timeout. 0 means no timeout, but strongly not recommended!
  pcp_timeout = 10
@@ -27,7 +25,22 @@
  
  # Logging directory
 -logdir = '/tmp'
-+logdir = '/var/run'
++logdir = '/var/log/pgpool'
  
- # Replication mode
- replication_mode = false
+ # pid file name
+ pid_file_name = '/var/run/pgpool/pgpool.pid'
+@@ -166,10 +164,10 @@
+ 
+ # backend_hostname, backend_port, backend_weight
+ # here are examples
+-#backend_hostname0 = 'host1'
+-#backend_port0 = 5432
+-#backend_weight0 = 1
+-#backend_data_directory0 = '/data'
++backend_hostname0 = 'localhost'
++backend_port0 = 5432
++backend_weight0 = 1
++backend_data_directory0 = '/var/lib/pgsql/data'
+ #backend_hostname1 = 'host2'
+ #backend_port1 = 5433
+ #backend_weight1 = 1
diff --git a/pgpool.init b/pgpool.init
index 89aa399..ee791c7 100755
--- a/pgpool.init
+++ b/pgpool.init
@@ -8,12 +8,14 @@
 #
 # v1.0.0 Devrim GUNDUZ <devrim@CommandPrompt.com>
 # - Initial version of Red Hat / Fedora init script
-# v1.0.1 Devrim GUNDUZ <devrim@CommandPrompt.com>
-# - - Honor /etc/sysconfig/pgpool settings. Previously we could never
-#  customize PGPOOLPID=/var/run/pgpool.pid et al.
-# - Remaining hardcoded paths replaced by customizable variables
-#   such as $PGPOOLCONF .
- 
+#
+# v2.2 Devrim GUNDUZ <devrim@CommandPrompt.com>
+# - New and improved version which has some fixes.
+
+if [ -r /etc/sysconfig/pgpool ]; then
+    . /etc/sysconfig/pgpool
+fi
+
 # Source function library.
 INITD=/etc/rc.d/init.d
 . $INITD/functions
@@ -29,30 +31,23 @@ TYPESET=`typeset -f|grep "declare"`
 [ "${NETWORKING}" = "no" ] && exit 0
 
 # Find the name of the script
-NAME=pgpool
+NAME=`basename $0`
+if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]
+then
+	NAME=${NAME:3}
+fi
 
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
-PGPOOLCONF=/etc/pgpool.conf
-PGPOOLPID=/var/run/pgpool.pid
+PGPOOLCONF=/etc/pgpool-II/pgpool.conf
+PGPOOLPIDDIR=/var/run/pgpool
 PGPOOLLOG=/var/log/pgpool.log
 
-# read in the site custom setup
-if [ -r /etc/sysconfig/pgpool ]; then
-    . /etc/sysconfig/pgpool
-fi
-
 test -x $PGPOOLDAEMON || exit 5
 
-# Create the pgpool.log log file if it does not exist
-if [ ! -r $PGPOOLLOG ]
-then
-	touch $PGPOOLLOG
-fi
-
-# Check whether the pgpool.conf config file exists or not
-if [ ! -r "$PGPOOLCONF" ]
+# Check whether the config file exists or not
+if [ ! -r $PGPOOLCONF ]
 then
 	echo "$PGPOOLCONF not found"
 	RETVAL=1
@@ -60,12 +55,36 @@ then
 	exit
 fi
 
+# Create the log file if it does not exist
+if [ ! -x $PGPOOLLOG ]
+then
+	touch $PGPOOLLOG
+	chown postgres: $PGPOOLLOG
+fi
+
+if [ ! -d $PGPOOLPIDDIR ]
+then
+	mkdir $PGPOOLPIDDIR
+	chown postgres: $PGPOOLPIDDIR
+fi
+
 script_result=0
 
 start(){
+	pid=`pidof -s "$PGPOOLDAEMON"`
+	if [ $pid ]
+	then
+		echo "pgpool is already running with pid $pid"
+		failure "$PGPOQL_START"
+		echo
+		script_result=1
+		exit 1
+	fi
+
 	PGPOOL_START=$"Starting ${NAME} service: "
 
 	echo -n "$PGPOOL_START"
+
 	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
@@ -76,7 +95,7 @@ start(){
 		touch /var/lock/subsys/${NAME}
 		echo
 	else
-		failure "$PSQL_START"
+		failure "$PGPOQL_START"
 		echo
 		script_result=1
 	fi
@@ -88,7 +107,8 @@ stop(){
                 RETVAL=1
                 failure
         else
-                killproc $PGPOOLDAEMON
+		killproc /usr/bin/pgpool
+#		$PGPOOLDAEMON stop & >> "$PGPOOLLOG" 2>&1 < /dev/null
                 RETVAL=$?
                 [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${NAME}
         fi;
@@ -98,7 +118,7 @@ stop(){
 
 switch() {
 	echo -n $"Sending switchover request to $NAME "
-	$PGPOOLDAEMON switch >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$PGPOOLDAEMON -f $PGPOOLCONF switch >> "$PGPOOLLOG" 2>&1 < /dev/null
 	RETVAL=$?
 	echo
 	if [ $RETVAL -eq 0 ] 
@@ -116,22 +136,23 @@ restart(){
 }
 
 reload(){
-echo -n $"Reloading ${NAME}: "
-   if [ -n "`pidfileofproc $PGPOOLDAEMON`" ] ; then
-      killproc $PGPOOLDAEMON -HUP
-   else
-      failure $"Reloading ${NAME}"
-   fi
-   RETVAL=$?
-   echo
+	echo -n $"Reloading ${NAME}: "
+
+	if [ -n "`pidfileofproc $PGPOOLDAEMON`" ] ; then
+		killproc $PGPOOLDAEMON -HUP
+	else
+		failure $"Reloading ${NAME}"
+	fi
+	RETVAL=$?
+	echo
 }
 
 condrestart(){
-    [ -e /var/lock/subsys/${NAME} ] && restart
+	[ -e /var/lock/subsys/${NAME} ] && restart
 }
 
 condstop(){
-    [ -e /var/lock/subsys/${NAME} ] && stop
+	[ -e /var/lock/subsys/${NAME} ] && stop
 }
 
 # See how we were called.
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 14cf654..b5dcc44 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	2.2
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
@@ -47,7 +47,7 @@ Development headers and libraries for pgpool-II.
 %patch1 -p0
 
 %build
-%configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath
+%configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath --sysconfdir=%{_sysconfdir}/%{short_name}/
 
 make %{?_smp_flags}
 
@@ -55,7 +55,10 @@ make %{?_smp_flags}
 rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
 install -d %{buildroot}%{_datadir}/%{short_name}
-mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_name}
+install -d %{buildroot}%{_sysconfdir}/%{short_name}
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -88,11 +91,12 @@ chkconfig --add pgpool
 %{_bindir}/pcp_systemdb_info
 %{_bindir}/pg_md5
 %{_mandir}/man8/pgpool*
+%dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
 %{_libdir}/libpcp.so.*
-%attr(764,root,root) %{_datadir}/%{short_name}/*.conf.sample
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
+%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -102,9 +106,23 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Mon Mar 23 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2-1.1
+- Fix pid file path in init script.
+- Fix spec file -- we don't use short_name macro in pgcore spec file.
+- Create pgpool pid file directory.
+- Fix stop/start routines, also improve init script a bit.
+- Install conf files to a new directory (/etc/pgpool-II), and get rid
+  of sample conf files.
+
 * Sun Mar 1 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2-1
 - Update to 2.2
-- Fix URL
+- Update URL
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec  4 2008 Michael Schwendt <mschwendt@fedoraproject.org> 2.1-2
+- Include /usr/share/pgpool-II directory.
 
 * Tue Aug 12 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-1
 - Update to 2.1 Gold

From 2f07ffac3b447d904c8677708c5855d18f8854e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Thu, 7 May 2009 10:42:02 +0000
Subject: [PATCH 24/33] Update to 2.2.2

---
 .cvsignore                | 1 +
 postgresql-pgpool-II.spec | 9 ++++++---
 sources                   | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5ee1445..9ccf1e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 pgpool-II-2.2.tar.gz
+pgpool-II-2.2.2.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index b5dcc44..eea564d 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:	2.2
-Release:	1%{?dist}.1
+Version:	2.2.2
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2108/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2191/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -106,6 +106,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Thu May 7 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2.2-1
+- Update to 2.2.2
+
 * Mon Mar 23 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2-1.1
 - Fix pid file path in init script.
 - Fix spec file -- we don't use short_name macro in pgcore spec file.
diff --git a/sources b/sources
index f978d1a..4c543f0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
+6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz

From 38ce353c874380e0c834406835b11d48eabded9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Fri, 2 Oct 2009 23:18:07 +0000
Subject: [PATCH 25/33] - Update to 2.2.4 - Re-apply a fix for #442372

---
 postgresql-pgpool-II.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index eea564d..8c0ddc4 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:	2.2.2
+Version:	2.2.4
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2191/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -96,7 +96,7 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
-%attr(764,root,apache) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
 
 %files devel
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sat Oct 3  2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2.4-1
+- Update to 2.2.4
+- Re-apply a fix for #442372
+
 * Thu May 7 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2.2-1
 - Update to 2.2.2
 

From a8e6a3a2c9734554988c598041f2aed4fdd1a84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Fri, 2 Oct 2009 23:20:55 +0000
Subject: [PATCH 26/33] Update sources and .cvsignore .

---
 .cvsignore | 3 +--
 sources    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9ccf1e0..c246731 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-pgpool-II-2.2.tar.gz
-pgpool-II-2.2.2.tar.gz
+pgpool-II-2.2.4.tar.gz
diff --git a/sources b/sources
index 4c543f0..c2d5885 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3dc286e2217478acbc05f127e74bd300  pgpool-II-2.2.tar.gz
-6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
+2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz

From 017dbda6f781c8cb0287c1d29b09a26bf379112e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 4 Oct 2009 10:39:39 +0000
Subject: [PATCH 27/33] - Update to 2.2.5, for various fixes described at    
 http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188    
 .html

---
 .cvsignore                | 2 +-
 postgresql-pgpool-II.spec | 8 ++++++--
 sources                   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c246731..020f125 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-2.2.4.tar.gz
+pgpool-II-2.2.5.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 8c0ddc4..9c2406e 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:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2362/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -106,6 +106,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sun Oct 4 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2.5-1
+- Update to 2.2.5, for various fixes described at 
+  http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html
+
 * Sat Oct 3  2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2.4-1
 - Update to 2.2.4
 - Re-apply a fix for #442372
diff --git a/sources b/sources
index c2d5885..a04ffe8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c9edd0512c5dc1dabab474b563a7a6c  pgpool-II-2.2.4.tar.gz
+410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz

From 21320f52d8471626ea6b234ca8c45b75de4c4e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Thu, 22 Oct 2009 11:59:35 +0000
Subject: [PATCH 28/33] Fix logging, per report from Toshihiro Kitagawa.

---
 pgpool.init      | 13 ++++++++++++-
 pgpool.sysconfig |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pgpool.init b/pgpool.init
index ee791c7..f09b982 100755
--- a/pgpool.init
+++ b/pgpool.init
@@ -11,6 +11,9 @@
 #
 # v2.2 Devrim GUNDUZ <devrim@CommandPrompt.com>
 # - New and improved version which has some fixes.
+#
+# v2.2.5 Devrim GUNDUZ <devrim@CommandPrompt.com>
+# - Fix logging.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool
@@ -37,6 +40,14 @@ then
 	NAME=${NAME:3}
 fi
 
+# For SELinux we need to use 'runuser' not 'su'
+if [ -x /sbin/runuser ]
+then
+    SU=runuser
+else
+    SU=su
+fi
+
 # Set defaults for configuration variables
 PGPOOLENGINE=/usr/bin
 PGPOOLDAEMON=$PGPOOLENGINE/pgpool
@@ -85,7 +96,7 @@ start(){
 
 	echo -n "$PGPOOL_START"
 
-	$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & >> "$PGPOOLLOG" 2>&1 < /dev/null
+	$SU -l postgres -c "$PGPOOLDAEMON -f $PGPOOLCONF $OPTS & " >> "$PGPOOLLOG" 2>&1 < /dev/null
 	sleep 2
 
 	pid=`pidof -s "$PGPOOLDAEMON"`
diff --git a/pgpool.sysconfig b/pgpool.sysconfig
index ef8e2e1..221869e 100644
--- a/pgpool.sysconfig
+++ b/pgpool.sysconfig
@@ -4,3 +4,4 @@
 # -d: debug mode. lots of debug information will be printed
 
 #OPTS=" -d -n"
+OPTS=" -n"

From c33c24c016808db88b607fced000e976f6067524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Sun, 1 Nov 2009 21:44:45 +0000
Subject: [PATCH 29/33] Remove init script from all runlevels before uninstall.
 Per RH Bugzilla     #532177

---
 postgresql-pgpool-II.spec | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 9c2406e..0188e46 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -3,7 +3,7 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	2.2.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
@@ -74,6 +74,12 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 chkconfig --add pgpool
 
+%preun
+if [ $1 = 0 ] ; then
+	/sbin/service pgpool condstop >/dev/null 2>&1
+	chkconfig --del pgpool
+fi
+
 %postun -p /sbin/ldconfig
 
 %files
@@ -106,6 +112,10 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sun Nov 01 2009 Devrim GUNDUZ <devrim@gunduz.org> - 2.2.5-2
+- Remove init script from all runlevels before uninstall. Per RH Bugzilla
+  #532177
+
 * Sun Oct 4 2009 Devrim Gunduz <devrim@CommandPrompt.com> 2.2.5-1
 - Update to 2.2.5, for various fixes described at 
   http://lists.pgfoundry.org/pipermail/pgpool-general/2009-October/002188.html

From f0b5939f91757853aa7a8202b1f9315fd59d606d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:43:48 +0000
Subject: [PATCH 30/33] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8d78723..02b9831 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := postgresql-pgpool-II
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 371910f71ed38476fb28814fc40d68696b32b80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Tue, 1 Dec 2009 21:46:23 +0000
Subject: [PATCH 31/33] - Update to 2.2.6

---
 .cvsignore                | 2 +-
 postgresql-pgpool-II.spec | 9 ++++++---
 sources                   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 020f125..718c248 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-2.2.5.tar.gz
+pgpool-II-2.2.6.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 0188e46..2bd5c08 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:	2.2.5
-Release:	2%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2423/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -112,6 +112,9 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Tue Dec 1 2009 Devrim GUNDUZ <devrim@gunduz.org> - 2.2.6-1
+- Update to 2.2.6
+
 * Sun Nov 01 2009 Devrim GUNDUZ <devrim@gunduz.org> - 2.2.5-2
 - Remove init script from all runlevels before uninstall. Per RH Bugzilla
   #532177
diff --git a/sources b/sources
index a04ffe8..f5b16c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-410fc3e226842eda25e5cd18e9c3e703  pgpool-II-2.2.5.tar.gz
+711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz

From eb839e075a9f3ade1edaafa85dc45cfe0a1ad3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= <devrim@fedoraproject.org>
Date: Wed, 9 Dec 2009 22:17:07 +0000
Subject: [PATCH 32/33] Adjust order of startup and kill, per RH bugzilla
 #545739.

---
 pgpool.init | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pgpool.init b/pgpool.init
index f09b982..e0a4119 100755
--- a/pgpool.init
+++ b/pgpool.init
@@ -1,7 +1,7 @@
 #!/bin/sh
 # pgpool    This is the init script for starting up pgpool-II
 #
-# chkconfig: - 64 36
+# chkconfig: - 235 74 33
 # description: Starts and stops the pgpool daemon
 # processname: pgpool
 # pidfile:	/var/run/pgpool.pid
@@ -14,6 +14,9 @@
 #
 # v2.2.5 Devrim GUNDUZ <devrim@CommandPrompt.com>
 # - Fix logging.
+#
+# v2.3 Devrim GUNDUZ <devrim@CommandPrompt.com>
+# - Adjust order of startup and kill, per RH bugzilla #545739.
 
 if [ -r /etc/sysconfig/pgpool ]; then
     . /etc/sysconfig/pgpool

From 94841efa855465b16fee603bfa150a5462f883e4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 09:39:57 +0000
Subject: [PATCH 33/33] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 02b9831..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: postgresql-pgpool-II
-# $Id$
-NAME := postgresql-pgpool-II
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index dc32377..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-10