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

- Added a buildrhel3 macro to fix RHEL 3 RPM builds
- Added a kerbdir macro

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.28 -> r1.29)
    slony1-engine/redhat:
        slony-I.specfile (r1.5 -> r1.6)

-------------- 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.28
retrieving revision 1.29
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.28 -r1.29
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -1,5 +1,8 @@
 %{!?perltools:%define perltools 1}
 %{!?docs:%define docs 1}
+%{?buildrhel3:%define kerbdir /usr/kerberos}
+%{!?kerbdir:%define kerbdir "/usr"}
+
 %define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
 
 Summary:	A "master to multiple slaves" replication system with cascading and failover.
@@ -50,8 +53,8 @@
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CPPFLAGS
-CFLAGS="${CFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CFLAGS
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et -I%{kerbdir}/include" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et -I%{kerbdir}/include" ; export CFLAGS
 
 # Strip out -ffast-math from CFLAGS....
 
@@ -122,6 +125,10 @@
 %endif
 
 %changelog
+* Wed Dec 21 2005 Devrim Gunduz <devrim at commandprompt.com> postgresql-slony1-engine
+- Added a buildrhel3 macro to fix RHEL 3 RPM builds
+- Added a kerbdir macro
+
 * Wed Dec 14 2005 Devrim Gunduz <devrim at commandprompt.com> postgresql-slony1-engine
 - Fixed the spec file so that during upgrade, conf files will not be replaced, and a .rpmnew will be created.
 
Index: slony-I.specfile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/redhat/slony-I.specfile,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lredhat/slony-I.specfile -Lredhat/slony-I.specfile -u -w -r1.5 -r1.6
--- redhat/slony-I.specfile
+++ redhat/slony-I.specfile
@@ -1,5 +1,8 @@
 %{!?perltools:%define perltools 1}
 %{!?docs:%define docs 0}
+%{?buildrhel3:%define kerbdir /usr/kerberos}
+%{!?kerbdir:%define kerbdir "/usr"}
+
 %define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
 
 Summary:	A "master to multiple slaves" replication system with cascading and failover.
@@ -51,8 +54,8 @@
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CPPFLAGS
-CFLAGS="${CFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CFLAGS
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et -I%{kerbdir}/include" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et -I%{kerbdir}/include" ; export CFLAGS
 
 # Strip out -ffast-math from CFLAGS....
 
@@ -111,10 +114,10 @@
 %{_libdir}/pgsql/slony1_funcs.so
 %{_libdir}/pgsql/xxid.so
 %{_datadir}/pgsql/*.sql
-%{_sysconfdir}/slon.conf
+%config(noreplace) %{_sysconfdir}/slon.conf
 %if %perltools
 %{_libdir}/pgsql/slon-tools.pm
-%{_sysconfdir}/slon_tools.conf
+%config(noreplace) %{_sysconfdir}/slon_tools.conf
 %endif
 
 %if %docs
@@ -124,6 +127,13 @@
 %endif
 
 %changelog
+* Wed Dec 21 2005 Devrim Gunduz <devrim at commandprompt.com> postgresql-slony1-engine
+- Added a buildrhel3 macro to fix RHEL 3 RPM builds
+- Added a kerbdir macro
+
+* Wed Dec 14 2005 Devrim Gunduz <devrim at commandprompt.com> postgresql-slony1-engine
+- Fixed the spec file so that during upgrade, conf files will not be replaced, and a .rpmnew will be created.
+
 * Thu Nov 24 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - Created bindir