From 7664a774e49326e79c07a67f2b68709dcdfff166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Sun, 5 Aug 2007 02:52:20 +0000 Subject: [PATCH 01/14] 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..022e44a --- /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-8/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 694f9b7af6b9503ff7c786f44ceeff6b0c0dc422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Sun, 5 Aug 2007 02:58:47 +0000 Subject: [PATCH 02/14] - 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 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 1.2-1 - Update to 1.2 From fa64be91d4e84d2ee884ebc867477fbfff26c9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Sun, 5 Aug 2007 03:03:11 +0000 Subject: [PATCH 03/14] 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 1.2-3 +- Added a patch for sample conf file to use Fedora defaults + * Sun Aug 5 2007 Devrim Gunduz 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 1.2-1 - Update to 1.2 From ab419a78f7210e20f9f74016f04ab151bd72c2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Thu, 16 Aug 2007 08:41:21 +0000 Subject: [PATCH 04/14] - 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 1.2-4 +- Fixed the directory name where sample conf files and sql files + are installed. + * Sun Aug 5 2007 Devrim Gunduz 1.2-3 - Added a patch for sample conf file to use Fedora defaults From 6f95032a26a50e94d3424d0ac1eed2e0498f2cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Thu, 16 Aug 2007 09:44:57 +0000 Subject: [PATCH 05/14] 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 1b0c05ffb66489e1d24fa5552e1c526d942e4f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Sat, 6 Oct 2007 00:25:06 +0000 Subject: [PATCH 06/14] 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 022e44a..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-8/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 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 From ee0a5ccc76882712dc473c2d1c69d36b8e671b53 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 09:52:36 +0000 Subject: [PATCH 07/14] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 1b6ac6a8c39070f9c9bbff9da49499189ed73da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Tue, 23 Oct 2007 06:47:06 +0000 Subject: [PATCH 08/14] 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 1.3-1 +- Update to 1.3 + * Fri Oct 5 2007 Devrim Gunduz 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 37afefd0d35393a2562746d86d7e1a29b070ea38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Mon, 14 Jan 2008 08:24:14 +0000 Subject: [PATCH 09/14] Update to 2.0.1 Add a temp patch that will disappear in 2.0.2 --- .cvsignore | 2 +- pool_process_query-2.0.1.patch | 27 +++++++++++++++++++++++++++ postgresql-pgpool-II.spec | 25 +++++++++++++++---------- sources | 2 +- 4 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 pool_process_query-2.0.1.patch 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/pool_process_query-2.0.1.patch b/pool_process_query-2.0.1.patch new file mode 100644 index 0000000..83dd7dc --- /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-8/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:14 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-8/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:14 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 f5f9c61..09af754 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -2,15 +2,16 @@ 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 +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 @@ -86,13 +86,14 @@ chkconfig --add pgpool %{_bindir}/pcp_proc_count %{_bindir}/pcp_proc_info %{_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 @@ -103,6 +104,10 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog +* Sun Jan 13 2008 Devrim Gunduz 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 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 88c2bbe0490f0b1c219abf3df9020e03186ab945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Sun, 20 Jan 2008 00:56:50 +0000 Subject: [PATCH 10/14] 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 2.0.1-2 +- Fix Requires of -devel package, per bz#429436 + * Sun Jan 13 2008 Devrim Gunduz 2.0.1-1 - Update to 2.0.1 - Add a temp patch that will disappear in 2.0.2 From 0341da7a5e19c19ffb1174827432940f789a4fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Tue, 12 Aug 2008 05:06:58 +0000 Subject: [PATCH 11/14] - Update to 2.1 Gold - Set group of sample config files to root, not apache. Fixes RH #442372. --- .cvsignore | 2 +- postgresql-pgpool-II.spec | 30 ++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 797f93b..4f063bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pgpool-II-2.0.1.tar.gz +pgpool-II-2.1.tar.gz diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 2b10f83..795cd45 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: 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,22 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog +* Tue Aug 12 2008 Devrim Gunduz 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 2.1-0.2.beta2 +- Fix Requires: issue, per #442021 (Alex Lancaster) + +* Sun Apr 6 2008 Devrim Gunduz 2.1-beta2 +- Update to 2.1 beta2 + +* Mon Feb 18 2008 Fedora Release Engineering - 2.0.1-3.1 +- Autorebuild for GCC 4.3 + +* Mon Jan 21 2008 Devrim GUNDUZ 2.0.1-2.1 +- Rebuilt against PostgreSQL 8.3 + * Sat Jan 19 2008 Devrim Gunduz 2.0.1-2 - Fix Requires of -devel package, per bz#429436 diff --git a/sources b/sources index 84948dd..64b0bb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdfd023b1400ae85455e8274bf0cb502 pgpool-II-2.0.1.tar.gz +cf02f9358f46849bd526798868e13162 pgpool-II-2.1.tar.gz From b21dccae1d64cb5d914cecac1f876d0bee33b60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Tue, 12 Aug 2008 05:34:21 +0000 Subject: [PATCH 12/14] - 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 | 1 + 2 files changed, 5 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..64fafc4 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -105,6 +105,7 @@ chkconfig --add pgpool * Tue Aug 12 2008 Devrim Gunduz 2.1-1 - Update to 2.1 Gold - Set group of sample config files to root, not apache. Fixes RH #442372. +- Update patch #1 * Fri Apr 11 2008 Devrim Gunduz 2.1-0.2.beta2 - Fix Requires: issue, per #442021 (Alex Lancaster) From 8ccbd9afb1401a2b37b8723a78a4c821c66dbd04 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:43:48 +0000 Subject: [PATCH 13/14] 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 a01a0e8a0b9b81cba05ea0e722b769957ccac528 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:39:50 +0000 Subject: [PATCH 14/14] 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8