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

Modified Files:
      Tag: REL_1_2_STABLE
	postgresql-slony1-engine.spec.in 
Log Message:
Final fixes for the main spec file.


Index: postgresql-slony1-engine.spec.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/postgresql-slony1-engine.spec.in,v
retrieving revision 1.31.2.13
retrieving revision 1.31.2.14
diff -C2 -d -r1.31.2.13 -r1.31.2.14
*** postgresql-slony1-engine.spec.in	3 Jun 2007 09:35:04 -0000	1.31.2.13
--- postgresql-slony1-engine.spec.in	5 Jun 2007 18:52:18 -0000	1.31.2.14
***************
*** 4,17 ****
  %{!?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}
  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)
  BuildRequires:	postgresql-devel
--- 4,17 ----
  %{!?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:	2_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
***************
*** 44,48 ****
  
  %description docs
! The @PACKAGE_NAME at -docs package includes some documentation for Slony-I.
  %endif
  
--- 44,49 ----
  
  %description docs
! The @PACKAGE_NAME at -docs package includes some 
! documentation for Slony-I.
  %endif
  
***************
*** 51,54 ****
--- 52,66 ----
  
  %build
+ 
+ #Â Temporary measure for 1.2.9
+ %if %docs
+ chmod 644 doc/concept/*
+ chmod 644 doc/adminguide/*
+ chmod 644 doc/implementation/*
+ chmod 644 doc/howto/*
+ chmod 644 doc/concept/*
+ chmod 644 doc/support/*
+ %endif
+ 
  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
***************
*** 62,71 ****
  ./configure --includedir %{_includedir}/pgsql --with-pgconfigdir=%{_bindir} \
  %if %perltools
!         --with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \
  %endif
  %if %docs
!         --with-docs --with-docdir=%{_docdir}/%{name}-%{version} \
  %endif
!         --datadir %{_datadir}/pgsql --sysconfdir=%{_sysconfdir} --with-pglibdir=%{_libdir}/pgsql 
  
  autoconf
--- 74,83 ----
  ./configure --includedir %{_includedir}/pgsql --with-pgconfigdir=%{_bindir} \
  %if %perltools
! 	--with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \
  %endif
  %if %docs
! 	--with-docs --with-docdir=%{_docdir}/%{name}-%{version} \
  %endif
! 	--datadir %{_datadir}/pgsql --sysconfdir=%{_sysconfdir} --with-pglibdir=%{_libdir}/pgsql 
  
  autoconf
***************
*** 73,77 ****
  make %{?_smp_mflags}
  %if %perltools
!         make %{?_smp_mflags} -C tools
  %endif
  
--- 85,89 ----
  make %{?_smp_mflags}
  %if %perltools
! 	make %{?_smp_mflags} -C tools
  %endif
  
***************
*** 92,98 ****
  then
  	install -d %{buildroot}/etc/rc.d/init.d
! 	install -m 755 redhat/slon.init %{buildroot}/etc/rc.d/init.d/slon
  fi
  
  
  %if %perltools
--- 104,115 ----
  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
+ 	rm -f doc/concept/.cvsignore
+ %endif
  
  %if %perltools
***************
*** 105,109 ****
  /bin/rm -f %{buildroot}%{_sysconfdir}/slon_tools.conf-sample
  /bin/rm -f %{buildroot}%{_bindir}/slon_tools.conf-sample
- #/bin/rm -f %{buildroot}%{_libdir}/pgsql/slon-tools.pm
  /bin/rm -f %{buildroot}%{_bindir}/slon-tools.pm
  /bin/rm -f %{buildroot}%{_bindir}/slon-tools
--- 122,125 ----
***************
*** 115,135 ****
  
  %post
! chkconfig --add slon
  
  %preun
  if [ $1 = 0 ] ; then
! 	/sbin/service slon condstop >/dev/null 2>&1
! 	chkconfig --del slon
  fi
  
  %postun
  if [ $1 -ge 1 ]; then
! 	/sbin/service slon condrestart >/dev/null 2>&1
  fi
  
- 
  %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
--- 131,150 ----
  
  %post
! chkconfig --add @PACKAGE_NAME@
  
  %preun
  if [ $1 = 0 ] ; then
! 	/sbin/service @PACKAGE_NAME@ condstop >/dev/null 2>&1
! 	chkconfig --del @PACKAGE_NAME@
  fi
  
  %postun
  if [ $1 -ge 1 ]; then
! 	/sbin/service @PACKAGE_NAME@ condrestart >/dev/null 2>&1
  fi
  
  %files
  %defattr(-,root,root,-)
! %attr(644,root,root) %doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE
  %{_bindir}/*
  %{_libdir}/pgsql/slony1_funcs.so
***************
*** 140,153 ****
  %{_libdir}/pgsql/slon-tools.pm
  %config(noreplace) %{_sysconfdir}/slon_tools.conf
! %{_sysconfdir}/rc.d/init.d/slon
  %endif
  
  %if %docs
  %files docs
! %defattr(-,root,root,-)
  %doc doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
  %endif
  
  %changelog
  * Thu May 17 2007 Devrim Gunduz <devrim at CommandPrompt.com>
  - Install init script with rpm.
--- 155,173 ----
  %{_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
! %defattr(644,root,root,-)
! %attr(755,root,root) %{_docdir}/%{name}-%{version}
  %doc doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
  %endif
  
  %changelog
+ * Sun Jun 3 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.9-2
+ - Some more fixes for Fedora review.
+ - Remove executable bits from docs.
+ 
  * Thu May 17 2007 Devrim Gunduz <devrim at CommandPrompt.com>
  - Install init script with rpm.