rpms/postgresql-pgpool-II/EL-4 postgresql-pgpool-II.spec,1.9,1.10

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool-II/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5017/EL-4

Modified Files:
	postgresql-pgpool-II.spec 
Log Message:
Update to 2.0.1
Add a temp patch that will disappear in 2.0.2




Index: postgresql-pgpool-II.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool-II/EL-4/postgresql-pgpool-II.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- postgresql-pgpool-II.spec	14 Jan 2008 08:18:30 -0000	1.9
+++ postgresql-pgpool-II.spec	14 Jan 2008 08:23:47 -0000	1.10
@@ -11,6 +11,7 @@
 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 @@
 %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 @@
 %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 @@
 %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
@@ -85,15 +85,15 @@
 %{_bindir}/pcp_node_info
 %{_bindir}/pcp_proc_count
 %{_bindir}/pcp_proc_info
-%{_bindir}/pcp_recovery_node
 %{_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
 
@@ -104,8 +104,9 @@
 %{_libdir}/libpcp.so
 
 %changelog
-* Sat Jan 5 2008 Devrim Gunduz <devrim at CommandPrompt.com> 2.0.1-1
+* Sun Jan 13 2008 Devrim Gunduz <devrim at CommandPrompt.com> 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 <devrim at CommandPrompt.com> 1.3-1
 - Update to 1.3