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


Modify CPPFLAGS and CFLAGS to fix builds on RHEL 3 and possibly earlier -- Per Philip Yarra

Tags:
----
REL_1_1_STABLE

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.19.2.3 -> r1.19.2.4)
    slony1-engine/redhat:
        slony-I.specfile (r1.1.2.2 -> r1.1.2.3)

-------------- 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.19.2.3
retrieving revision 1.19.2.4
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.19.2.3 -r1.19.2.4
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -40,8 +40,8 @@
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
-CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CFLAGS
 
 # Strip out -ffast-math from CFLAGS....
 
@@ -108,6 +108,9 @@
 %endif
 
 %changelog
+* Wed Oct 26 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Modify CPPFLAGS and CFLAGS to fix builds on RHEL -- Per Philip Yarra
+
 * Tue Oct 18 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - 1.1.2
 - Fixed the problem in http://gborg.postgresql.org/pipermail/slony1-general/2005-October/003105.html 
Index: slony-I.specfile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/redhat/slony-I.specfile,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lredhat/slony-I.specfile -Lredhat/slony-I.specfile -u -w -r1.1.2.2 -r1.1.2.3
--- redhat/slony-I.specfile
+++ redhat/slony-I.specfile
@@ -40,8 +40,8 @@
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
-CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et -I/usr/kerberos/include" ; export CFLAGS
 
 # Strip out -ffast-math from CFLAGS....
 
@@ -49,7 +49,7 @@
 export LIBNAME=%{_lib}
 ./configure --includedir %{_includedir}/pgsql \
 %if %perltools
-        --with-perltools=%{_bindir} \
+	--with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \
 %endif
 %if %docs
         --with-docs --with-docdir=/usr/share/doc \
@@ -60,8 +60,7 @@
 
 make
 %if %perltools
- cd tools
- make
+ make -C tools
 %endif
 
 %install
@@ -83,6 +82,7 @@
 /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
 install -m 0755 altperl/* $RPM_BUILD_ROOT%{_bindir}/
+install -m 0755 altperl/slon-tools $RPM_BUILD_ROOT%{_libdir}/pgsql/slon-tools.pm
 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
@@ -109,6 +109,10 @@
 %endif
 
 %changelog
+* Wed Oct 26 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Modify CPPFLAGS and CFLAGS to fix builds on RHEL -- Per Philip Yarra
+- Fixed the problem in http://gborg.postgresql.org/pipermail/slony1-general/2005-October/003105.html 
+
 * Tue Jul 12 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - Added a line to check postgresql RPM version and tag SlonyI RPM with it.
 - Updated Requires files so that it checks correct PostgreSQL version