From db75a622a831d3e148024168be31339ee8127606 Mon Sep 17 00:00:00 2001
From: Rosa <rosa@rosa-build.rosalab.ru>
Date: Wed, 1 Feb 2012 21:34:12 +0400
Subject: [PATCH] Automatic import for version 1.2

---
 .abf.yml                            |  2 ++
 pgpool-ha-1.2-destdir.patch         | 14 ++++++++
 pgpool-ha-1.2-pgpool.pid-path.patch | 21 +++++++++++
 postgresql-pgpool-ha.spec           | 56 +++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+)
 create mode 100644 .abf.yml
 create mode 100644 pgpool-ha-1.2-destdir.patch
 create mode 100644 pgpool-ha-1.2-pgpool.pid-path.patch
 create mode 100644 postgresql-pgpool-ha.spec

diff --git a/.abf.yml b/.abf.yml
new file mode 100644
index 0000000..2236956
--- /dev/null
+++ b/.abf.yml
@@ -0,0 +1,2 @@
+sources:
+  "pgpool-ha-1.2.tar.gz": 64d4ebe8e50d7a51ffa19cdbafd6a3ffbea71b7c
diff --git a/pgpool-ha-1.2-destdir.patch b/pgpool-ha-1.2-destdir.patch
new file mode 100644
index 0000000..9ce0e63
--- /dev/null
+++ b/pgpool-ha-1.2-destdir.patch
@@ -0,0 +1,14 @@
+diff -p -up pgpool-ha-1.2/src/Makefile.in.destdir~ pgpool-ha-1.2/src/Makefile.in
+--- pgpool-ha-1.2/src/Makefile.in.destdir~	2010-09-04 23:46:38.498625694 +0200
++++ pgpool-ha-1.2/src/Makefile.in	2010-09-04 23:47:12.722364445 +0200
+@@ -19,8 +19,8 @@ pgpool: pgpool.in
+ 	sed -e 's#@_PGPOOL_@#${PGPOOL}#g' > pgpool
+ 
+ install: all
+-	$(INSTALL_PROGRAM) pgpool /usr/lib/ocf/resource.d/heartbeat/
+-	$(INSTALL_PROGRAM) pgpool.monitor ${PGPOOL}.monitor
++	$(INSTALL_PROGRAM) pgpool -D $(DESTDIR)/usr/lib/ocf/resource.d/heartbeat/pgpool
++	$(INSTALL_PROGRAM) pgpool.monitor -D $(DESTDIR)${PGPOOL}.monitor
+ 
+ 
+ clean:
diff --git a/pgpool-ha-1.2-pgpool.pid-path.patch b/pgpool-ha-1.2-pgpool.pid-path.patch
new file mode 100644
index 0000000..28f6b4b
--- /dev/null
+++ b/pgpool-ha-1.2-pgpool.pid-path.patch
@@ -0,0 +1,21 @@
+diff -p -up pgpool-ha-1.2/src/pgpool.in.pidpath~ pgpool-ha-1.2/src/pgpool.in
+--- pgpool-ha-1.2/src/pgpool.in.pidpath~	2010-09-05 22:40:27.605365012 +0200
++++ pgpool-ha-1.2/src/pgpool.in	2010-09-05 22:40:31.585364961 +0200
+@@ -62,7 +62,7 @@ if [ "x$OCF_RESKEY_logfile" != 'x' ]; th
+ 	LOGFILE=$OCF_RESKEY_logfile
+ fi
+ if [ "x$OCF_RESKEY_pidfile" = 'x' ]; then
+-	PGPOOL_PID=/tmp/pgpool.pid
++	PGPOOL_PID=/var/run/pgpool/pgpool.pid
+ else
+ 	PGPOOL_PID=$OCF_RESKEY_pidfile
+ fi
+@@ -205,7 +205,7 @@ cat <<EOF
+          Path to pgpool.pid
+       </longdesc>
+       <shortdesc lang="en">pidfile</shortdesc>
+-      <content type="string" default="/tmp/pgpool.pid" />
++      <content type="string" default="/var/run/pgpool/pgpool.pid" />
+     </parameter>
+     <parameter name="options" unique="0" required="0">
+       <longdesc lang="en">
diff --git a/postgresql-pgpool-ha.spec b/postgresql-pgpool-ha.spec
new file mode 100644
index 0000000..badfff4
--- /dev/null
+++ b/postgresql-pgpool-ha.spec
@@ -0,0 +1,56 @@
+%define short_name	pgpool-ha
+
+Summary:	Pgpool-HA uses heartbeat to keep pgpool from being a single point of failure
+Name:		postgresql-%{short_name}
+Version:	1.2
+Release:	%mkrel 1
+License:	BSD
+Group:		Databases
+URL:		http://pgpool.projects.PostgreSQL.org
+Source0:	http://pgfoundry.org/frs/download.php/1124/%{short_name}-%{version}.tar.gz
+Patch0:		pgpool-ha-1.2-destdir.patch
+Patch1:		pgpool-ha-1.2-pgpool.pid-path.patch
+BuildRequires:	heartbeat postgresql-pgpool-II
+Requires:	postgresql-pgpool-II heartbeat
+Provides:	%{short_name} = %{version}-%{release}
+BuildArch:	noarch
+
+%description
+Pgpool-HA combines pgpool with heartbeat. Pgpool is a replication
+server of PostgreSQL and makes reliability, but the pgpool server is
+always a single point failure.  Pgpool-HA uses heartbeat to eliminate
+this.
+
+%prep
+%setup -q -n %{short_name}-%{version}
+%patch0 -p1 -b .destdir~
+%patch1 -p1 -b .pidpath~
+
+%build
+%configure2_5x
+%make -C src
+
+%install
+rm -rf %{buildroot}
+%makeinstall_std -C src
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc README COPYING AUTHORS ChangeLog NEWS
+%doc doc/pgpool-ha.en.txt
+%lang(ja) %doc doc/pgpool-ha.ja.txt
+%{_bindir}/pgpool.monitor
+%{_prefix}/lib/ocf/resource.d/heartbeat/pgpool
+
+
+%changelog
+* Tue Sep 07 2010 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.2-1mdv2011.0
++ Revision: 576596
+- add missing buildrequires
+- fix path to pgpool.pid (P1)
+- import postgresql-pgpool-ha
+
+