rpms/postgresql-pgpoolAdmin/devel .cvsignore, 1.2, 1.3 postgresql-pgpoolAdmin-conf.patch, 1.1, 1.2 postgresql-pgpoolAdmin.spec, 1.6, 1.7 sources, 1.2, 1.3
Devrim GÜNDÜZ
devrim at fedoraproject.org
Mon Mar 23 18:06:57 UTC 2009
Author: devrim
Update of /cvs/extras/rpms/postgresql-pgpoolAdmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4004
Modified Files:
.cvsignore postgresql-pgpoolAdmin-conf.patch
postgresql-pgpoolAdmin.spec sources
Log Message:
Update to 2.2
Fix spec and update patches so that it works against new pgpool 2.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpoolAdmin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Jun 2007 06:08:43 -0000 1.2
+++ .cvsignore 23 Mar 2009 18:06:26 -0000 1.3
@@ -1 +1,2 @@
pgpoolAdmin-1.0.0.tar.gz
+pgpoolAdmin-2.2.tar.gz
postgresql-pgpoolAdmin-conf.patch:
Index: postgresql-pgpoolAdmin-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpoolAdmin/devel/postgresql-pgpoolAdmin-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-pgpoolAdmin-conf.patch 16 Jun 2007 06:08:43 -0000 1.1
+++ postgresql-pgpoolAdmin-conf.patch 23 Mar 2009 18:06:26 -0000 1.2
@@ -1,5 +1,5 @@
---- pgpoolAdmin-1.0.0/conf/pgmgt.conf.php.old 2006-09-26 08:42:27.000000000 +0300
-+++ pgpoolAdmin-1.0.0/conf/pgmgt.conf.php 2006-09-26 08:43:00.000000000 +0300
+--- pgpoolAdmin-2.2/conf/pgmgt.conf.php.old 2009-03-23 19:18:36.000000000 +0200
++++ pgpoolAdmin-2.2/conf/pgmgt.conf.php 2009-03-23 19:19:05.000000000 +0200
@@ -1,14 +1,14 @@
<?php
-define('_PGPOOL2_LANG', 'ja');
@@ -7,42 +7,40 @@
-define('_PGPOOL2_PASSWORD_FILE', '/usr/local/etc/pcp.conf');
-define('_PGPOOL2_COMMAND', '/usr/local/bin/pgpool');
+define('_PGPOOL2_LANG', 'en');
-+define('_PGPOOL2_CONFIG_FILE', '/etc/pgpool.conf');
-+define('_PGPOOL2_PASSWORD_FILE', '/etc/pcp.conf');
++define('_PGPOOL2_CONFIG_FILE', '/etc/pgpool-II/pgpool.conf');
++define('_PGPOOL2_PASSWORD_FILE', '/etc/pgpool-II/pcp.conf');
+define('_PGPOOL2_COMMAND', '/usr/bin/pgpool');
define('_PGPOOL2_CMD_OPTION_C', '0');
define('_PGPOOL2_CMD_OPTION_D', '0');
define('_PGPOOL2_CMD_OPTION_M', 's');
define('_PGPOOL2_CMD_OPTION_N', '0');
- define('_PGPOOL2_LOG_FILE', '/tmp/pgpool.log');
+-define('_PGPOOL2_LOG_FILE', '/tmp/pgpool.log');
-define('_PGPOOL2_PCP_DIR', '/usr/local/bin');
++define('_PGPOOL2_LOG_FILE', '/var/log/pgpool/pgpool.log');
+define('_PGPOOL2_PCP_DIR', '/usr/bin');
define('_PGPOOL2_PCP_HOSTNAME', 'localhost');
define('_PGPOOL2_PCP_TIMEOUT', '');
define('_PGPOOL2_STATUS_REFRESH_TIME', '0');
---- pgpoolAdmin/install/defaultParameter.php.old 2006-09-26 12:48:09.000000000 +0300
-+++ pgpoolAdmin/install/defaultParameter.php 2006-09-26 12:48:31.000000000 +0300
-@@ -23,17 +23,17 @@
+--- pgpoolAdmin-2.2/install/defaultParameter.php.old 2009-03-23 19:18:42.000000000 +0200
++++ pgpoolAdmin-2.2/install/defaultParameter.php 2009-03-23 19:19:22.000000000 +0200
+@@ -23,15 +23,15 @@
* @version CVS: $Id$
*/
-define("_PGPOOL2_CONFIG_FILE", "/usr/local/etc/pgpool.conf");
-define("_PGPOOL2_PASSWORD_FILE", "/usr/local/etc/pcp.conf");
-define("_PGPOOL2_COMMAND", "/usr/local/bin/pgpool");
-+define("_PGPOOL2_CONFIG_FILE", "/etc/pgpool.conf");
-+define("_PGPOOL2_PASSWORD_FILE", "/etc/pcp.conf");
++define("_PGPOOL2_CONFIG_FILE", "/etc/pgpool-II/pgpool.conf");
++define("_PGPOOL2_PASSWORD_FILE", "/etc/pgpool-II/pcp.conf");
+define("_PGPOOL2_COMMAND", "/usr/bin/pgpool");
define("_PGPOOL2_CMD_OPTION_C", "0");
define("_PGPOOL2_CMD_OPTION_D", "0");
define("_PGPOOL2_CMD_OPTION_M", "s");
define("_PGPOOL2_CMD_OPTION_N", "0");
- define("_PGPOOL2_LOG_FILE", "/tmp/pgpool.log");
+-define("_PGPOOL2_LOG_FILE", "/tmp/pgpool.log");
-define("_PGPOOL2_PCP_DIR", "/usr/local/bin");
++define("_PGPOOL2_LOG_FILE", "/var/log/pgpool/pgpool.log");
+define("_PGPOOL2_PCP_DIR", "/usr/bin");
define("_PGPOOL2_PCP_HOSTNAME", "localhost");
define("_PGPOOL2_PCP_TIMEOUT", "10");
define("_PGPOOL2_STATUS_REFRESH_TIME", "0");
-
--?>
-\ No newline at end of file
-+?>
Index: postgresql-pgpoolAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpoolAdmin/devel/postgresql-pgpoolAdmin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- postgresql-pgpoolAdmin.spec 18 Mar 2009 00:10:36 -0000 1.6
+++ postgresql-pgpoolAdmin.spec 23 Mar 2009 18:06:27 -0000 1.7
@@ -2,14 +2,14 @@
Summary: PgpoolAdmin - web-based pgpool administration
Name: postgresql-pgpoolAdmin
-Version: 1.0.0
-Release: 11%{?dist}
+Version: 2.2
+Release: 1%{?dist}
License: BSD
Group: Applications/Databases
URL: http://pgpool.projects.postgresql.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://pgfoundry.org/frs/download.php/980/%{short_name}-%{version}.tar.gz
+Source0: http://pgfoundry.org/frs/download.php/2109/%{short_name}-%{version}.tar.gz
Source1: %{name}.conf
Requires: php >= 4.4.2
@@ -51,8 +51,15 @@
%post
/sbin/service httpd reload > /dev/null 2>&1
-%postun
+ chgrp apache /var/log/pgpool
+ chgrp apache /var/run/pgpool
+ chmod g+rwx /var/run/pgpool/
+ chmod g+rwx /var/log/pgpool/
+
+%postun
/sbin/service httpd reload > /dev/null 2>&1
+ chmod g-rwx /var/run/pgpool
+ chmod g-rwx /var/log/pgpool
%clean
rm -rf %{buildroot}
@@ -76,6 +83,10 @@
%{_pgpoolAdmindir}/screen.css
%changelog
+* Mon Mar 23 2009 Devrim Gunduz <devrim at commandprompt.com> 2.2-1
+- Update to 2.2
+- Update spec and patches so that pgpoolAdmin works against pgpool 2.2
+
* Wed Mar 18 2009 Robert Scheck <robert at fedoraproject.org> 1.0.0-11
- Corrected a typo at %%attr in %%files section
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpoolAdmin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Jun 2007 06:08:43 -0000 1.2
+++ sources 23 Mar 2009 18:06:27 -0000 1.3
@@ -1 +1,2 @@
1a4a69e5fd7941008319d565b1957207 pgpoolAdmin-1.0.0.tar.gz
+a27079fae35b5a6cd57f2ad32f96c0f0 pgpoolAdmin-2.2.tar.gz
More information about the fedora-extras-commits
mailing list