From 00b10a3577cda2326463398634dc6ecbe74a9a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 6 Jul 2012 11:03:46 +0200 Subject: [PATCH] Update to 3.1.0-RC2 - This is a private snapshot the author sent --- libspatialite.spec | 100 ++++++++++++++++++++++++++++++++++----------- sources | 2 +- 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/libspatialite.spec b/libspatialite.spec index ec1444e..a4c00fb 100644 --- a/libspatialite.spec +++ b/libspatialite.spec @@ -1,24 +1,57 @@ +#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} +%global _geocallback "--enable-geocallbacks" +%endif + +# GEOS 3.3 is only available from F16 and EL6 on and up +# Older versions don't allow for "geosadvanced" +%if 0%{?rhel} + +#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 advancedgeos +%global _no_checks 1 +%endif + Name: libspatialite -Version: 2.4.0 -Release: 0.7.RC4%{?dist} +Version: 3.1.0 +Release: 0.1.RC2%{?dist} Summary: Enables SQLite to support spatial data Group: System Environment/Libraries -License: MPLv1.1 -URL: http://www.gaia-gis.it/spatialite -Source0: http://www.gaia-gis.it/spatialite-2.4.0-4/%{name}-%{version}.tar.gz +License: MPLv1.1 or GPLv2+ or LGPLv2+ +URL: https://www.gaia-gis.it/fossil/libspatialite +#Source0: http://www.gaia-gis.it/gaia-sins/%{name}-%{version}.tar.gz +# The RC was supplied personally by the developer +Source0: http://www.gaia-gis.it/gaia-sins/%{name}-%{version}-RC2.tar.gz + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: proj-devel geos-devel sqlite-devel +# EPEL 5 reminiscences are for ELGIS + +#BuildRequires: autoconf automake libtool +BuildRequires: proj-devel +BuildRequires: freexl-devel +BuildRequires: sqlite-devel +BuildRequires: geos-devel +BuildRequires: lcov + +# Doesn't build on ppc64 +# https://bugzilla.redhat.com/show_bug.cgi?id=663938 +ExcludeArch: ppc64 %description -SpatiaLite extension enables SQLite to support spatial data, in -a way conformant to OpenGIS specifications. It implements -spatial indices, spatial functions and supports metadata. +SpatiaLite is a a library extending the basic SQLite core +in order to get a full fledged Spatial DBMS, really simple +and lightweight, but mostly OGC-SFS compliant. %package devel -Summary: Development Libraries for the SpatiaLite extension -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Summary: Development libraries and headers for SpatiaLite +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for @@ -26,18 +59,16 @@ developing applications that use %{name}. %prep -%setup -q +#%setup -q +%setup -q -n %{name}-%{version}-RC2 %build -# Geocallbacks work with SQLite 3.7.3, available in F15, but not in RHEL yet. -%if (0%{?fedora} < 15 || 0%{?rhel}) %configure \ --disable-static \ - --disable-geocallbacks -%else -%configure --disable-static -%endif + --enable-gcov \ + %{?_geocallback} \ + %{?_geosadvanced} make %{?_smp_mflags} @@ -51,6 +82,13 @@ make install DESTDIR=%{buildroot} rm -f %{buildroot}/%{_libdir}/%{name}.la +%check +make %{?_smp_mflags} coverage-init +#TODO: Tests don't respect destdir, it seems +# Doesn't respect missing FreeXl -- e-mailed the author +make check +make coverage + %clean rm -rf %{buildroot} @@ -61,20 +99,36 @@ rm -rf %{buildroot} %files -%defattr(-,root,root,-) %doc COPYING AUTHORS %{_libdir}/%{name}.so.* - %files devel -%defattr(-,root,root,-) +%doc examples/*.c %{_includedir}/spatialite.h -%{_includedir}/spatialite/* +%{_includedir}/spatialite %{_libdir}/%{name}.so %{_libdir}/pkgconfig/spatialite.pc %changelog +* Fri Jan 27 2012 Volker Fröhlich - 3.1.0-0.1.RC2 +- Add pkconfig as Requirement to the devel sub-package +- Drop freexl patch (solved), build with Freexl +- Update descriptions and summaries +- Re-design conditionals for build flags +- Don't run checks if built without advancedgeos +- Include examples as documentation + +* Wed Jan 14 2012 Volker Fröhlich - 3.0.1-1 +- New upstream release +- Drop defattr +- Run tests +- Own spatialite include-dir +- Add GPLv2+ and LGPLv2+ as alternative licenses +- Update URL and source URL +- Reduce build conditions to EPEL or not +- Use isa macro in base package Requires + * Fri Jan 13 2012 Fedora Release Engineering - 2.4.0-0.7.RC4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 2389093..63927f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -976c087dc2d02f745d718f73f91a561e libspatialite-2.4.0.tar.gz +2f756574a65badc6a8257672cecb136b libspatialite-3.1.0-RC2.tar.gz