- Update patch #1: Fix build failure caused by new default patch fuzz = 0

policy in rawhide

.cvsignore

@@ -1 +1 @@
-pgpool-II-2.0.1.tar.gz
+pgpool-II-2.1.tar.gz

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'

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:	2%{?dist}
+Version:	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/1521/%{short_name}-%{version}.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
-Patch4:		pool_process_query-%{version}.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel pam-devel
 
@@ -38,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}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Development headers and libraries for pgpool-II.
@@ -46,7 +45,6 @@ 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
@@ -85,14 +83,14 @@ 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*
 %{_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
@@ -104,6 +102,12 @@ 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.
+- Fix Requires: issue, per #442021 (Alex Lancaster)
+- Update patch #1
+
 * Sat Jan 19 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.0.1-2
 - Fix Requires of -devel package, per bz#429436
 

sources

@@ -1 +1 @@
-fdfd023b1400ae85455e8274bf0cb502  pgpool-II-2.0.1.tar.gz
+cf02f9358f46849bd526798868e13162  pgpool-II-2.1.tar.gz