SPECS: pgpool.spec - revert (it's inconsistent macro), adapter too

[glen]

Author: glen                         Date: Wed Jun 18 12:35:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revert (it's inconsistent macro), adapter too

---- Files affected:
SPECS:
   pgpool.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/pgpool.spec
diff -u SPECS/pgpool.spec:1.11 SPECS/pgpool.spec:1.12
--- SPECS/pgpool.spec:1.11	Wed Jun 18 11:10:10 2008
+++ SPECS/pgpool.spec	Wed Jun 18 14:35:44 2008
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # TODO
-#	- I think it shuld be daemon so rc-scripts support is needed 
+#	- I think it shuld be daemon so rc-scripts support is needed
 #	(user pgpool?) init script must be fixed
 #
 %bcond_without	pam	# don't build with pam support
@@ -30,15 +30,15 @@
 %{?with_pam:Requires: pam}
 Requires:	rc-scripts >= 0.2.0
 Provides:	group(pgpool)
-Provides:	user(pgpool)
 Provides:	pgpool
+Provides:	user(pgpool)
 Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Pgpool is a connection pooling/replication server for PostgreSQL.
 Pgpool runs between PostgreSQL's clients(front ends) and servers
-(backends). A PostgreSQL client can connect to pgpool as if it
-were a standard PostgreSQL server.
+(backends). A PostgreSQL client can connect to pgpool as if it were a
+standard PostgreSQL server.
 
 %description -l pl.UTF-8
 Pgpool to serwer puli połączeń i replikacji dla PostgreSQL-a.
@@ -74,16 +74,16 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,logrotate.d,monit,pam.d} \
 	$RPM_BUILD_ROOT%{_initrddir} \
-        $RPM_BUILD_ROOT%{_sbindir} 
+        $RPM_BUILD_ROOT%{_sbindir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 install pgpool $RPM_BUILD_ROOT%{_bindir}/
 install pgpool.conf.sample   $RPM_BUILD_ROOT%{_sysconfdir}/pgpool.conf
 install pool_hba.conf.sample $RPM_BUILD_ROOT%{_sysconfdir}/pool_hba.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
-install %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 %if %{with pam}
 install pgpool.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pgpool
 %endif
@@ -119,7 +119,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/pgpool
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pgpool.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pool_hba.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %{_mandir}/man8/pgpool.8*
 %if %{with pam}
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{name}
@@ -135,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2008/06/18 12:35:44  glen
+- revert (it's inconsistent macro), adapter too
+
 Revision 1.11  2008/06/18 09:10:10  sardzent
 - next macro
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pgpool.spec?r1=1.11&r2=1.12&f=u