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

Modified Files:
      Tag: REL_1_2_STABLE
	postgresql-slony1-engine.specfile 
Log Message:
Sync with fedora spec file


Index: postgresql-slony1-engine.specfile
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/redhat/Attic/postgresql-slony1-engine.specfile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** postgresql-slony1-engine.specfile	5 Jun 2007 18:45:57 -0000	1.1.2.1
--- postgresql-slony1-engine.specfile	11 Jun 2007 05:54:56 -0000	1.1.2.2
***************
*** 6,23 ****
  %{!?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:		postgresql-slony1-engine
  Version:	1.2.9
! Release:	2_PG%{pg_version}%{?dist}
  License:	BSD
  Group:		Applications/Databases
  URL:		http://main.slony.info/
  Source0:	http://main.slony.info/downloads/1.2/source/%{sname}-%{version}.tar.bz2
- Source2:	postgresql-%{sname}-engine.init
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! BuildRequires:	postgresql-devel = %{pg_version}
! Requires:	postgresql-server = %{pg_version}
  
  %if %docs
--- 6,20 ----
  %{!?kerbdir:%define kerbdir "/usr"}
  
  Summary:	A "master to multiple slaves" replication system with cascading and failover
  Name:		postgresql-slony1-engine
  Version:	1.2.9
! Release:	3%{?dist}
  License:	BSD
  Group:		Applications/Databases
  URL:		http://main.slony.info/
  Source0:	http://main.slony.info/downloads/1.2/source/%{sname}-%{version}.tar.bz2
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! BuildRequires:	postgresql-devel, postgresql-server
! Requires:	postgresql-server
  
  %if %docs
***************
*** 45,48 ****
--- 42,46 ----
  Group:		Applications/Databases
  Requires:	%{name}-%{version}-%{release}
+ BuildRequires	libjpeg, netpbm-progs, groff, docbook-style-dsssl, ghostscript
  
  %description docs
***************
*** 82,88 ****
  	--with-docs --with-docdir=%{_docdir}/%{name}-%{version} \
  %endif
! 	--datadir %{_datadir}/pgsql --sysconfdir=%{_sysconfdir} --with-pglibdir=%{_libdir}/pgsql 
! 
! autoconf
  
  make %{?_smp_mflags}
--- 80,84 ----
  	--with-docs --with-docdir=%{_docdir}/%{name}-%{version} \
  %endif
! 	--datadir %{_datadir}/pgsql --with-pglibdir=%{_libdir}/pgsql 
  
  make %{?_smp_mflags}
***************
*** 129,133 ****
  /bin/rm -f %{buildroot}%{_bindir}/slon-tools
  /bin/rm -f %{buildroot}%{_bindir}/pgsql/slon-tools
- /bin/rm -f altperl/old-apache-rotatelogs.patch
  %endif
  
--- 125,128 ----
***************
*** 149,157 ****
  fi
  
- 
  %files
  %defattr(-,root,root,-)
! %attr(755,root,root) %{_docdir}/%{name}
! %attr(644,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
--- 144,150 ----
  fi
  
  %files
  %defattr(-,root,root,-)
! %attr(644,root,root) %doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE*
  %{_bindir}/*
  %{_libdir}/pgsql/slony1_funcs.so
***************
*** 171,174 ****
--- 164,171 ----
  
  %changelog
+ * Mon Jun 11 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.9-3
+ - Add BuildRequires for docs subpackage, per RH#199154 (Thanks Ruben)
+ - Various small fixes
+ 
  * Sun Jun 3 2007 Devrim Gunduz <devrim at CommandPrompt.com>
  - Some more fixes for Fedora review.