- Fixed the directory name where sample conf files and sql files are

installed.

postgresql-pgpool-II.spec

@@ -3,14 +3,19 @@
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
 Version:	1.2
-Release:	1%{?dist}
+Release:	4%{?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
+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
 
+Obsoletes:	postgresql-pgpool
+
 %description
 pgpool-II is a inherited project of pgpool (to classify from 
 pgpool-II, it is sometimes called as pgpool-I). For those of 
@@ -39,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
@@ -48,7 +54,11 @@ 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
+install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/pgpool
 
 # nuke libtool archive and static lib
 rm -f %{buildroot}%{_libdir}/libpcp.{a,la}
@@ -73,10 +83,12 @@ 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
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,6 +97,17 @@ 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
+
+* Sun Aug 5 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-2
+- Added an init script for pgpool
+- Added /etc/sysconfig/pgpool
+
 * Wed Aug 1 2007 Devrim Gunduz <devrim@CommandPrompt.com> 1.2-1
 - Update to 1.2