From 63fd7f819d69c454cac54d0023cc967b2acc2b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Thu, 30 Jan 2014 00:44:58 +0100 Subject: [PATCH] Update conditionals for EPEL7 --- libspatialite.spec | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libspatialite.spec b/libspatialite.spec index b61e321..9cd510f 100644 --- a/libspatialite.spec +++ b/libspatialite.spec @@ -6,18 +6,18 @@ #EPSG data in libspatialite should be in sync with our current GDAL version -# Geocallbacks work with SQLite 3.7.3 and up, available in Fedora, -# but not in EL, including 6; are off by default -%if 0%{?fedora} +# Geocallbacks work with SQLite 3.7.3 and up, available in Fedora and EL 7 +# The author expects malfunction in versions of libxml2 older than 2.8 +%if (0%{?fedora} || 0%{?rhel} > 6) %global _libxml2 "--enable-libxml2=yes" %global _geocallback "--enable-geocallbacks" -%endif -#%if 0%{?fedora} > 18 -# The author expects malfunction in older versions of libxml2 than 2.8 -#%global _lwgeom "--enable-lwgeom=yes" +# A new feature available in PostGIS 2.0 +#%%global _lwgeom "--enable-lwgeom=yes" +# Disabled due to a circular dependency issue with PostGIS +# https://bugzilla.redhat.com/show_bug.cgi?id=979179 %global _lwgeom "--enable-lwgeom=no" -#%endif +%endif # GEOS 3.3 is only available in Fedora and from EL6 on and up # Older versions don't allow for "geosadvanced" @@ -54,13 +54,11 @@ BuildRequires: proj-devel BuildRequires: sqlite-devel BuildRequires: zlib-devel -%if 0%{?fedora} +%if (0%{?fedora} || 0%{?rhel} > 6) BuildRequires: libxml2-devel +#BuildRequires: postgis %endif -#%if 0%{?fedora} > 18 -#BuildRequires: postgis -#%endif %description SpatiaLite is a a library extending the basic SQLite core @@ -137,6 +135,9 @@ rm -rf %{buildroot} %changelog +* Thu Jan 23 2014 Volker Fröhlich - 4.1.1-2 +- Update for EPEL 7 + * Sat Aug 03 2013 Fedora Release Engineering - 4.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild