libxml2 default flag changed and no support for geos 3.2

- Also move mod_spatialite.so to the main package

libspatialite.spec

@@ -6,27 +6,31 @@
 
 #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 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"
-
 # 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"
+%global _lwgeom "--disable-lwgeom"
+
+# Geocallbacks work with SQLite 3.7.3 and up, available in Fedora and EL 7
+%if (0%{?fedora} || 0%{?rhel} > 6)
+  %global _geocallback "--enable-geocallbacks"
+%endif
+
+%if 0%{?rhel} == 6
+# Checks are known to fail if libspatialite is built without geosadvanced
+#TODO: Fails to build, reported by mail. If geosadvanced is disabled, linker flags miss geos_c
+#TODO: Check if that's still true anywhere
+  %global _geosadvanced "--disable-geosadvanced"
+  %global _no_checks 1
 %endif
 
-# GEOS 3.3 is only available in Fedora and from EL6 on and up
-# Older versions don't allow for "geosadvanced"
 %if 0%{?rhel} == 5
+# GEOS 3.2 is no longer supported
+  %global _geos"--disable-geos"
 
-#TODO: Fails to build, reported by mail. If geosadvanced is disabled, linker flags miss geos_c
-%global _geosadvanced "--disable-geosadvanced"
-# Checks are known to fail if libspatialite is built without geosadvanced
-# TODO: Check if that's still true anywhere
+# The author expects malfunction in versions of libxml2 older than 2.8
+  %global _libxml2 "--disable-libxml2"
 %endif
 
 # check_bufovflw test fails on gcc 4.9
@@ -37,7 +41,7 @@
 
 Name:      libspatialite
 Version:   4.2.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Enables SQLite to support spatial data
 Group:     System Environment/Libraries
 License:   MPLv1.1 or GPLv2+ or LGPLv2+
@@ -84,6 +88,7 @@ developing applications that use %{name}.
     --disable-static \
     %{?_lwgeom}   \
     %{?_libxml2}   \
+    %{?_geos}   \
     %{?_geocallback}   \
     %{?_geosadvanced}
 
@@ -120,17 +125,24 @@ rm -rf %{buildroot}
 %doc COPYING AUTHORS
 %{_libdir}/%{name}.so.7*
 %{_libdir}/mod_spatialite.so.7*
+# The symlink must be present to allow loading the extension
+# https://groups.google.com/forum/#!topic/spatialite-users/zkGP-gPByXk
+%{_libdir}/mod_spatialite.so
 
 %files devel
 %doc examples/*.c
 %{_includedir}/spatialite.h
 %{_includedir}/spatialite
 %{_libdir}/%{name}.so
-%{_libdir}/mod_spatialite.so
 %{_libdir}/pkgconfig/spatialite.pc
 
 
 %changelog
+* Tue Jul 29 2014 Volker Fröhlich <volker27@gmx.at> - 4.2.0-2
+- libxml2 default is now "yes"
+- Disable geos support for EL5, as geos 3.2 is no longer supported
+- Move the mod_spatialite symlink to the main package
+
 * Fri Jul 25 2014 Peter Robinson <pbrobinson@fedoraproject.org> 4.2.0-1
 - Update to 4.2.0