[spatialite-gui] New upstream release 1.6.0

[Volker Fröhlich]

commit 77f819c228c9764ac2e9b58a2e07588c2046ead8
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sun Jan 6 01:01:35 2013 +0100

    New upstream release 1.6.0

 spatialite-gui-1.6.0-geos-c.patch |   11 ++++++++++
 spatialite-gui.spec               |   41 +++++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 17 deletions(-)
---
diff --git a/spatialite-gui-1.6.0-geos-c.patch b/spatialite-gui-1.6.0-geos-c.patch
new file mode 100644
index 0000000..28694e3
--- /dev/null
+++ b/spatialite-gui-1.6.0-geos-c.patch
@@ -0,0 +1,11 @@
+diff -Nur spatialite_gui-1.6.0/configure spatialite_gui-1.6.0-geos-c/configure
+--- spatialite_gui-1.6.0/configure	2012-11-25 00:46:53.000000000 +0100
++++ spatialite_gui-1.6.0-geos-c/configure	2013-01-06 00:09:36.444719118 +0100
+@@ -16428,6 +16428,7 @@
+ fi
+ 
+ LIBS="$LIBS_SAVE"
++LIBS=$LIBS$GEOS_LDFLAGS' -lgeos_c'
+ 
+ 
+ 
diff --git a/spatialite-gui.spec b/spatialite-gui.spec
index d30e5b2..ce67e43 100644
--- a/spatialite-gui.spec
+++ b/spatialite-gui.spec
@@ -1,18 +1,23 @@
 Name:           spatialite-gui
-Version:        1.5.0
-Release:        5%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        GUI to manage Spatialite databases
 
 Group:          Applications/Databases
 License:        GPLv3+
 URL:            https://www.gaia-gis.it/fossil/spatialite_gui
-Source0:        http://www.gaia-gis.it/gaia-sins/spatialite_gui-%{version}-stable.tar.gz
+Source0:        http://www.gaia-gis.it/gaia-sins/spatialite_gui-%{version}.tar.gz
 
-# No libspatialite for ppc and ppc64, see
-# https://bugzilla.redhat.com/show_bug.cgi?id=663938
-# https://bugzilla.redhat.com/show_bug.cgi?id=846301
+# No libspatialite for ppc and ppc64
+# due to problems with symbols in libharfbuzz
+#TODO: Ticket
 ExcludeArch:    ppc ppc64
 
+# Link geos_c
+# Taken as a part from
+# https://www.gaia-gis.it/fossil/spatialite_gui/ci/594d7d5a92?sbs=0
+Patch0:         %{name}-1.6.0-geos-c.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  freexl-devel
 BuildRequires:  libspatialite-devel
@@ -27,7 +32,9 @@ GUI to manage Spatialite databases.
 
 
 %prep
-%setup -q -n spatialite_gui-%{version}-stable
+%setup -q -n spatialite_gui-%{version}
+
+%patch0 -p1 -b .geos-c
 
 # Delete shebang from desktop file
 #TODO: Clarify
@@ -40,13 +47,9 @@ rm -f Makefile-static*
 %build
 
 %configure  \
-        --disable-static \
-        --enable-unicode \
-        --enable-graphics_ctx
+        --disable-static
 make %{?_smp_mflags}
 
-#TODO: Only works with libspatialite 3, it seems -- at least if you enable freexl
-
 
 %install
 make install DESTDIR=%{buildroot}
@@ -57,17 +60,21 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps
 install -pm 0644 gnome_resource/%{name}.png %{buildroot}%{_datadir}/pixmaps
 
 desktop-file-install                               \
---dir=%{buildroot}%{_datadir}/applications         \
-gnome_resource/%{name}.desktop
+    --dir=%{buildroot}%{_datadir}/applications         \
+    gnome_resource/%{name}.desktop
 
 
 %files
-%doc COPYING
+%doc COPYING AUTHORS
 %{_bindir}/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Jan  6 2013 Volker Fröhlich <volker27 at gmx.at> 1.6.0-1
+- New upstream release
+- Patch missing linking instruction
+
 * Sun Dec  2 2012 Bruno Wolff III <bruno at wolff.to> 1.5.0-5
 - Rebuild for libspatialite soname bump
 
@@ -91,8 +98,8 @@ gnome_resource/%{name}.desktop
 * Mon Jan  9 2012 Volker Fröhlich <volker27 at gmx.at> 1.4.0-3
 - Exclude ppc64 architecture
 
-* Wed Jan  8 2012 Volker Fröhlich <volker27 at gmx.at> 1.4.0-2
+* Sun Jan  8 2012 Volker Fröhlich <volker27 at gmx.at> 1.4.0-2
 - Remove post and postun sections with useless ldconfig
 
-* Wed Dec  4 2011 Volker Fröhlich <volker27 at gmx.at> 1.4.0-1
+* Sun Dec  4 2011 Volker Fröhlich <volker27 at gmx.at> 1.4.0-1
 - Initial packaging