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

- Removed --bindir and --libdir, since they are not needed.
- moved --with-docdir to the proper place, reflecting recent commits.

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

-------------- 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.14
retrieving revision 1.15
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.14 -r1.15
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -1,5 +1,5 @@
 %{!?perltools:%define perltools 1}
-%{!?docs:%define docs 0}
+%{!?docs:%define docs 1}
 
 Summary:	A "master to multiple slaves" replication system with cascading and failover.
 Name:		@PACKAGE_NAME@
@@ -42,15 +42,14 @@
 
 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 \
+./configure --includedir %{_includedir}/pgsql \
 %if %perltools
         --with-perltools=%{_bindir} \
 %endif
 %if %docs
-        --with-docs \
+        --with-docs --with-docdir=/usr/share/doc \
 %endif
-        --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql --with-docdir=/usr/share/doc 
+        --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql 
 make
 %if %perltools
  cd tools
@@ -105,6 +104,7 @@
 * 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.
+- Removed --bindir and --libdir, since they are not needed.
 
 * 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.4
retrieving revision 1.5
diff -Lredhat/slony-I.spec -Lredhat/slony-I.spec -u -w -r1.4 -r1.5
--- redhat/slony-I.spec
+++ redhat/slony-I.spec
@@ -42,15 +42,14 @@
 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 \
+./configure --includedir %{_includedir}/pgsql \
 %if %perltools
         --with-perltools=%{_bindir} \
 %endif
 %if %docs
-        --with-docs \
+        --with-docs --with-docdir=/usr/share/doc \
 %endif
-        --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql --with-docdir=/usr/share/doc 
+        --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql 
 make
 %if %perltools
  cd tools
@@ -106,6 +105,7 @@
 * 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.
+- Removed --bindir and --libdir, since they are not needed.
 
 * Mon Apr 10 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - More fixes on RPM builds