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


Currently, our prebuilt RPMs were against PostgreSQL 8.0.3 and there was no tagging about that.
Since we need to build different RPMs for different PostgreSQL builds, I intended to check PostgreSQL RPM version and tag SlonyI RPM with that version.

This will also be backpatched to 1.1 branch.

So here is the changelog:

- Added a line to check postgresql RPM version and tag SlonyI RPM with it.
- Updated Requires files so that it checks correct PostgreSQL version
- Moved autoconf line into correct place.

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.20 -> r1.21)

-------------- 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.20
retrieving revision 1.21
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.20 -r1.21
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -1,10 +1,11 @@
 %{!?perltools:%define perltools 1}
 %{!?docs:%define docs 0}
+%define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
 
 Summary:	A "master to multiple slaves" replication system with cascading and failover.
 Name:		@PACKAGE_NAME@
 Version:	@PACKAGE_VERSION@
-Release:	1
+Release:	1_PG%{pg_version}
 License:	Berkeley/BSD
 Group:		Applications/Databases
 URL:		http://slony.info/
@@ -12,7 +13,7 @@
 Source0:	@PACKAGE_NAME at -%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	postgresql-devel
-Requires:	postgresql-server
+Requires:	postgresql-server = %{pg_version}
 
 %if %docs
 BuildRequires:	docbook-style-dsssl
@@ -35,7 +36,6 @@
 
 %prep
 %setup -q -n @PACKAGE_NAME at -%{version}
-autoconf
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
@@ -55,6 +55,9 @@
         --with-docs --with-docdir=/usr/share/doc \
 %endif
         --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql 
+
+autoconf
+
 make
 %if %perltools
  cd tools
@@ -106,6 +109,11 @@
 %endif
 
 %changelog
+* 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
+- Moved autoconf line into correct place.
+
 * Thu Jun 08 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
 - Added UPGRADING, HISTORY-1.1, INSTALL, SAMPLE among installed files, reflecting the change in GNUMakefile.in