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

Modified Files:
      Tag: REL_1_2_STABLE
	postgresql-slony1-engine.spec.in 
Log Message:
- Fix Source0
- Spec file cleanup (removed macro for perltools)
- Added initscripts as BR.
- Fix doc package installation path (and ownership issue)



Index: postgresql-slony1-engine.spec.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/postgresql-slony1-engine.spec.in,v
retrieving revision 1.31.2.18
retrieving revision 1.31.2.19
diff -C2 -d -r1.31.2.18 -r1.31.2.19
*** postgresql-slony1-engine.spec.in	14 Jun 2007 15:02:20 -0000	1.31.2.18
--- postgresql-slony1-engine.spec.in	6 Aug 2007 07:12:55 -0000	1.31.2.19
***************
*** 1,20 ****
- %{!?perltools:%define perltools 1}
  %{!?docs:%define docs 1}
  %{?buildrhel3:%define kerbdir /usr/kerberos}
  %{!?kerbdir:%define kerbdir "/usr"}
  
- %define pg_version	%(rpm -qv postgresql-devel|head -n 1|awk -F '-' '{print $3}')
- 
  Summary:	A "master to multiple slaves" replication system with cascading and failover
  Name:		@PACKAGE_NAME@
  Version:	@PACKAGE_VERSION@
! Release:	1_PG%{pg_version}%{?dist}
  License:	BSD
  Group:		Applications/Databases
  URL:		http://main.slony.info/
! Source0:	http://main.slony.info/downloads/1.2/source/@PACKAGE_NAME@-%{version}.tar.gz
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! BuildRequires:	postgresql-devel, postgresql-server, autoconf
! Requires:	postgresql-server = %{pg_version}
  
  %if %docs
--- 1,17 ----
  %{!?docs:%define docs 1}
  %{?buildrhel3:%define kerbdir /usr/kerberos}
  %{!?kerbdir:%define kerbdir "/usr"}
  
  Summary:	A "master to multiple slaves" replication system with cascading and failover
  Name:		@PACKAGE_NAME@
  Version:	@PACKAGE_VERSION@
! Release:	1%{?dist}
  License:	BSD
  Group:		Applications/Databases
  URL:		http://main.slony.info/
! Source0:	http://main.slony.info/downloads/1.2/source/@PACKAGE_NAME@-%{version}.tar.bz2
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! BuildRequires:	postgresql-devel, postgresql-server, initscripts
! Requires:	postgresql-server 
  
  %if %docs
***************
*** 22,27 ****
  %endif
  
- %define prefix /usr
- 
  %description
  Slony-I is a "master to multiple slaves" replication 
--- 19,22 ----
***************
*** 54,60 ****
  %build
  
! #Â Temporary measure for 1.2.10-pre
  %if %docs
! chmod -R 644 doc/*
  %endif
  
--- 49,55 ----
  %build
  
! #Â Temporary measure for 1.2.10
  %if %docs
! find doc/ -type f -exec chmod 600 {} \;
  %endif
  
***************
*** 64,75 ****
  CFLAGS="${CFLAGS} -I%{_includedir}/et -I%{kerbdir}/include" ; export CFLAGS
  
- # Strip out -ffast-math from CFLAGS....
- 
- CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
  export LIBNAME=%{_lib}
  %configure --includedir %{_includedir}/pgsql --with-pgconfigdir=%{_bindir} --libdir=%{_libdir} \
- %if %perltools
  	--with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \
- %endif
  %if %docs
  	--with-docs --with-docdir=%{_docdir}/%{name}-%{version} \
--- 59,65 ----
***************
*** 77,86 ****
  	--datadir %{_datadir}/pgsql --with-pglibdir=%{_libdir}/pgsql 
  
- autoconf
- 
  make %{?_smp_mflags}
! %if %perltools
! 	make %{?_smp_mflags} -C tools
! %endif
  
  %install
--- 67,72 ----
  	--datadir %{_datadir}/pgsql --with-pglibdir=%{_libdir}/pgsql 
  
  make %{?_smp_mflags}
! make %{?_smp_mflags} -C tools
  
  %install
***************
*** 96,107 ****
  install -m 0755 tools/*.sh  %{buildroot}%{_bindir}/
  install -m 0644 share/slon.conf-sample %{buildroot}%{_sysconfdir}/slon.conf
  
! if [ -d /etc/rc.d/init.d ]
! then
! 	install -d %{buildroot}/etc/rc.d/init.d
! 	install -m 755 redhat/@PACKAGE_NAME at .init %{buildroot}/etc/rc.d/init.d/@PACKAGE_NAME@
! fi
  
! #Â Temporary measure for 1.2.9
  %if %docs
  	rm -f doc/implementation/.cvsignore
--- 82,91 ----
  install -m 0755 tools/*.sh  %{buildroot}%{_bindir}/
  install -m 0644 share/slon.conf-sample %{buildroot}%{_sysconfdir}/slon.conf
+ /bin/chmod 644 COPYRIGHT UPGRADING SAMPLE HISTORY-1.1 RELEASE
  
! install -d %{buildroot}%{_initrddir}
! install -m 755 redhat/postgresql-slony1-engine.init %{buildroot}%{_initrddir}/postgresql-slony1-engine
  
! #Â Temporary measure for 1.2.10
  %if %docs
  	rm -f doc/implementation/.cvsignore
***************
*** 109,113 ****
  %endif
  
- %if %perltools
  cd tools
  make %{?_smp_mflags} DESTDIR=%{buildroot} install
--- 93,96 ----
***************
*** 122,126 ****
  /bin/rm -f %{buildroot}%{_bindir}/pgsql/slon-tools
  /bin/rm -f %{buildroot}%{_bindir}/old-apache-rotatelogs.patch
- %endif
  
  %clean
--- 105,108 ----
***************
*** 149,165 ****
  %{_datadir}/pgsql/*.sql
  %config(noreplace) %{_sysconfdir}/slon.conf
- %if %perltools
  %{_libdir}/pgsql/slon-tools.pm
  %config(noreplace) %{_sysconfdir}/slon_tools.conf
  %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/@PACKAGE_NAME@
- %endif
  
  %if %docs
  %files docs
- %attr(755,root,root) %{_docdir}/%{name}-%{version}
  %attr(644,root,root) %doc doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
  %endif
  
  %changelog
  * Wed Jun 13 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.10-1
  - Update to 1.2.10
--- 131,150 ----
  %{_datadir}/pgsql/*.sql
  %config(noreplace) %{_sysconfdir}/slon.conf
  %{_libdir}/pgsql/slon-tools.pm
  %config(noreplace) %{_sysconfdir}/slon_tools.conf
  %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/@PACKAGE_NAME@
  
  %if %docs
  %files docs
  %attr(644,root,root) %doc doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
  %endif
  
  %changelog
+ * Mon Aug 6 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.10-2
+ - Fix Source0
+ - Spec file cleanup (removed macro for perltools)
+ - Added initscripts as BR.
+ - Fix doc package installation path (and ownership issue)
+ 
  * Wed Jun 13 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.10-1
  - Update to 1.2.10