Update of /home/cvsd/slony1/slony1-engine
In directory main.slony.info:/tmp/cvs-serv24752

Modified Files:
	postgresql-slony1-engine.spec.in 
Log Message:
Install init script with rpm.
Fix --with-pgconfigdir parameter
Disable doc build by default, since there are sgml errors.



Index: postgresql-slony1-engine.spec.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/postgresql-slony1-engine.spec.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** postgresql-slony1-engine.spec.in	17 May 2007 05:52:06 -0000	1.35
--- postgresql-slony1-engine.spec.in	17 May 2007 07:58:56 -0000	1.36
***************
*** 1,4 ****
  %{!?perltools:%define perltools 1}
! %{!?docs:%define docs 1}
  %{?buildrhel3:%define kerbdir /usr/kerberos}
  %{!?kerbdir:%define kerbdir "/usr"}
--- 1,4 ----
  %{!?perltools:%define perltools 1}
! %{!?docs:%define docs 0}
  %{?buildrhel3:%define kerbdir /usr/kerberos}
  %{!?kerbdir:%define kerbdir "/usr"}
***************
*** 12,16 ****
  License:	BSD
  Group:		Applications/Databases
! URL:		http://slony.info/
  Source0:	@PACKAGE_NAME at -%{version}.tar.gz
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
--- 12,16 ----
  License:	BSD
  Group:		Applications/Databases
! URL:		http://main.slony.info/
  Source0:	@PACKAGE_NAME at -%{version}.tar.gz
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
***************
*** 60,64 ****
  CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
  export LIBNAME=%{_lib}
! ./configure --includedir %{_includedir}/pgsql --with_pgconfigdir=%{_bindir} \
  %if %perltools
          --with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \
--- 60,64 ----
  CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
  export LIBNAME=%{_lib}
! ./configure --includedir %{_includedir}/pgsql --with-pgconfigdir=%{_bindir} \
  %if %perltools
          --with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \
***************
*** 79,82 ****
--- 79,83 ----
  rm -rf %{buildroot}
  install -d %{buildroot}%{_sysconfdir}
+ install -d %{buildroot}%{_sysconfdir}/init.d/
  install -d %{buildroot}%{_datadir}/pgsql/
  install -d %{buildroot}%{_libdir}/pgsql/
***************
*** 88,91 ****
--- 89,93 ----
  install -m 0755 tools/*.sh  %{buildroot}%{_bindir}/
  install -m 0644 share/slon.conf-sample %{buildroot}%{_sysconfdir}/slon.conf
+ install -m 0755 redhat/slon.init %{buildroot}%{_sysconfdir}/init.d/slon
  
  %if %perltools
***************
*** 109,113 ****
  %files
  %defattr(-,root,root,-)
! %doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE-1.2.1 RELEASE-1.2.2 RELEASE-1.2.5 RELEASE-1.2.6 RELEASE-1.2.7 RELEASE-1.2.8 RELEASE-1.2.9
  %{_bindir}/*
  %{_libdir}/pgsql/slony1_funcs.so
--- 111,115 ----
  %files
  %defattr(-,root,root,-)
! %doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE-1.2.1 RELEASE-1.2.2 
  %{_bindir}/*
  %{_libdir}/pgsql/slony1_funcs.so
***************
*** 115,118 ****
--- 117,121 ----
  %{_datadir}/pgsql/*.sql
  %config(noreplace) %{_sysconfdir}/slon.conf
+ %{_sysconfdir}/init.d/slon
  %if %perltools
  %{_libdir}/pgsql/slon-tools.pm