[postgis: 7/7] require pgsql version used for building

Nils Philippsen nphilipp at fedoraproject.org
Sun Apr 3 12:33:50 UTC 2011


commit 7e5b6b7dc79dbacf5ec261669b5478d59fbdefbf
Author: Nils Philippsen <nils at redhat.com>
Date:   Sun Apr 3 14:24:52 2011 +0200

    require pgsql version used for building

 postgis.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/postgis.spec b/postgis.spec
index 85a7459..1355fb7 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -4,6 +4,9 @@
 
 %global majorversion 1.5
 
+%global pg_version_minimum 8.2
+%global pg_version_built  %(if [ -x %{_bindir}/pg_config ]; then %{_bindir}/pg_config --version | /bin/sed 's,^PostgreSQL *,,gi'; else echo %{pg_version_minimum}; fi)
+
 Summary:	Geographic Information Systems Extensions to PostgreSQL
 Name:		postgis
 Version:	1.5.1
@@ -17,9 +20,9 @@ Patch0:		postgis-1.5.1-pgsql9.patch
 URL:		http://postgis.refractions.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	postgresql-devel >= 8.2, proj-devel, geos-devel >= 3.1.1, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
+BuildRequires:	postgresql-devel >= %{pg_version_minimum}, proj-devel, geos-devel >= 3.1.1, byacc, proj-devel, flex, sinjdoc, java, java-devel, ant
 BuildRequires:	gtk2-devel, libxml2-devel
-Requires:	postgresql >= 8.2, geos >= 3.1.1, proj
+Requires:	postgresql >= %{pg_version_built}, geos >= 3.1.1, proj
 
 %description
 PostGIS adds support for geographic objects to the PostgreSQL object-relational
@@ -174,6 +177,7 @@ rm -rf %{buildroot}
 %changelog
 * Sun Apr 03 2011 Nils Philippsen <nils at redhat.com> - 1.5.1-3
 - cope with PostgreSQL 9.0 build environment
+- require pgsql version used for building
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list