CVS User Account cvsuser
Thu Jun 2 09:28:16 PDT 2005
Log Message:
-----------

Remove slon-tools.conf-sample from bindir.

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.13 -> r1.14)
    slony1-engine/redhat:
        slony-I.spec (r1.3 -> r1.4)

-------------- 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.13
retrieving revision 1.14
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.13 -r1.14
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -75,9 +75,10 @@
 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.pm  $RPM_BUILD_ROOT%{_libdir}/pgsql/
+/bin/rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf-sample
+/bin/rm -f  $RPM_BUILD_ROOT%{_bindir}/slon_tools.conf-sample
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/slon-tools.pm
 /bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools.pm
 %endif
@@ -103,6 +104,7 @@
 %changelog
 * Thu Jun 02 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - Apply a new %docs macro and disable building of docs by default.
+- Remove slon-tools.conf-sample from bindir.
 
 * Mon Apr 10 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - More fixes on RPM builds
Index: slony-I.spec
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/redhat/slony-I.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lredhat/slony-I.spec -Lredhat/slony-I.spec -u -w -r1.3 -r1.4
--- redhat/slony-I.spec
+++ redhat/slony-I.spec
@@ -74,10 +74,12 @@
 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/slon_tools.conf-sample  
+$RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf
 install -m 0755 altperl/* $RPM_BUILD_ROOT%{_bindir}/
 install -m 0755 altperl/slon-tools.pm  $RPM_BUILD_ROOT%{_libdir}/pgsql/
+/bin/rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf-sample
+/bin/rm -f  $RPM_BUILD_ROOT%{_bindir}/slon_tools.conf-sample
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/slon-tools.pm
 /bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools.pm
 %endif
@@ -103,6 +105,7 @@
 %changelog
 * Thu Jun 02 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - Apply a new %docs macro and disable building of docs by default.
+- Remove slon-tools.conf-sample from bindir.
 
 * Mon Apr 10 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - More fixes on RPM builds


More information about the Slony1-commit mailing list