Log Message:
-----------


More fixes on RPM builds

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.10 -> r1.11)

-------------- next part --------------
Index: postgresql-slony1-engine.spec.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/postgresql-slony1-engine.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.10 -r1.11
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -41,7 +41,6 @@
 
 CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
 export LIBNAME=%{_lib}
-
 ./configure --bindir /usr/bin --libdir %{_libdir}/pgsql \
         --includedir %{_includedir}/pgsql \
 %if %perltools
@@ -65,14 +64,15 @@
 install -m 0755 src/backend/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
 install -m 0755 src/xxid/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
 install -m 0755 tools/*.sh  $RPM_BUILD_ROOT%{_bindir}/
-install -m 0755 share/slon.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/
+install -m 0755 share/slon.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/slon.conf
 
 %if %perltools
 cd tools
 make DESTDIR=$RPM_BUILD_ROOT install
 /bin/rm -rf altperl/*.pl altperl/ToDo altperl/README altperl/Makefile altperl/CVS
+install -m 0755 altperl/slon_tools.conf-sample  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf
+/bin/rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf-sample
 install -m 0755 altperl/* $RPM_BUILD_ROOT%{_bindir}/
-install -m 0755 altperl/slon_tools.conf-sample  $RPM_BUILD_ROOT%{_sysconfdir}/
 install -m 0755 altperl/slon-tools.pm  $RPM_BUILD_ROOT%{_libdir}/pgsql/
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/slon-tools.pm
 /bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools.pm
@@ -81,11 +81,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-echo "Slony1 has been successfully installed. Before running Slony1,"
-echo "be sure to edit /etc/slon.conf-sample and rename it to"
-echo "/etc/slon.conf"
-
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
@@ -93,17 +88,20 @@
 %{_libdir}/pgsql/slony1_funcs.so
 %{_libdir}/pgsql/xxid.so
 %{_datadir}/pgsql/*.sql
-%{_sysconfdir}/slon.conf-sample
+%{_sysconfdir}/slon.conf
 %if %perltools
 %{_libdir}/pgsql/slon-tools.pm
-%{_sysconfdir}/slon_tools.conf-sample
+%{_sysconfdir}/slon_tools.conf
 %endif
 
 %changelog
+* Mon Apr 10 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- More fixes on RPM builds
+
 * Thu Apr 07 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - More fixes on RPM builds
 
-* Thu Apr 04 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+* Tue Apr 04 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - Fix RPM build errors, regarding to tools/ .
 
 * Thu Apr 02 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine