[spatialite-gui] New upstream release 1.5

[Volker Fröhlich]

commit fef10c0c90136918c03a3db1e85356d53f8739ae
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Fri Jul 6 13:03:15 2012 +0200

    New upstream release 1.5

 .gitignore                        |    1 +
 sources                           |    2 +-
 spatialite-gui-1.4.0-wxtree.patch |   21 ----------------
 spatialite-gui.desktop            |    9 -------
 spatialite-gui.spec               |   47 +++++++++++++++++++------------------
 5 files changed, 26 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc79ade..903b1a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /spatialite_gui-1.4.0.tar.gz
+/spatialite_gui-1.5.0-stable.tar.gz
diff --git a/sources b/sources
index 5e0d9ad..43ccaba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cdea0d2a925db58cfda278b79542171  spatialite_gui-1.4.0.tar.gz
+0b2f8eb95392ddcd8993787578c6e45f  spatialite_gui-1.5.0-stable.tar.gz
diff --git a/spatialite-gui.spec b/spatialite-gui.spec
index a73e91d..bdcb953 100644
--- a/spatialite-gui.spec
+++ b/spatialite-gui.spec
@@ -1,24 +1,17 @@
-#TODO: Icons in debug package
-
 Name:           spatialite-gui
-Version:        1.4.0
-Release:        3%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        GUI to manage Spatialite databases
 
 Group:          Applications/Databases
-License:        GPLv3
-URL:            http://www.gaia-gis.it/spatialite-2.4.0-4
-Source0:        http://www.gaia-gis.it/spatialite-2.4.0-4/spatialite_gui-%{version}.tar.gz
-Source1:        %{name}.desktop
+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
 
 # No libspatialite for ppc, see
 # https://bugzilla.redhat.com/show_bug.cgi?id=663938
 ExcludeArch:    ppc64
 
-#http://groups.google.com/group/spatialite-users/browse_thread/thread/e20cc142f11479f0/8be146e6021a3cc4
-# Resolved in this manner in the 1.5 beta
-Patch0:         %{name}-1.4.0-wxtree.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  libspatialite-devel
 BuildRequires:  libgaiagraphics-devel
@@ -32,16 +25,15 @@ GUI to manage Spatialite databases.
 
 
 %prep
-%setup -q -n spatialite_gui-%{version}
+%setup -q -n spatialite_gui-%{version}-stable
+
+# Delete shebang from desktop file
+#TODO: Clarify
+sed -i '1d' gnome_resource/%{name}.desktop
 
 # Remove existing Makefiles
 rm -f Makefile-static*
 
-# Solved in trunk
-sed -i 's/LIBS = @LIBS@/LIBS = -lproj -lgeos_c @LIBS@/' Makefile.in
-
-%patch0 -p1 -b .wxtree
-
 
 %build
 
@@ -51,6 +43,8 @@ sed -i 's/LIBS = @LIBS@/LIBS = -lproj -lgeos_c @LIBS@/' Makefile.in
         --enable-graphics_ctx
 make %{?_smp_mflags}
 
+#TODO: Only works with libspatialite 3, it seems -- at least if you enable freexl
+
 
 %install
 make install DESTDIR=%{buildroot}
@@ -58,22 +52,29 @@ make install DESTDIR=%{buildroot}
 # Install icon and desktop file
 # Mailed the author
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-cp -p icons/icon_info.xpm %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
-chmod 644 %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
+install -pm 0644 gnome_resource/%{name}.png %{buildroot}%{_datadir}/pixmaps
 
 desktop-file-install                               \
 --dir=%{buildroot}%{_datadir}/applications         \
-%{SOURCE1}
+gnome_resource/%{name}.desktop
 
 
 %files
 %doc COPYING
 %{_bindir}/*
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.xpm
+%{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Wed Jan  9 2012 Volker Fröhlich <volker27 at gmx.at> 1.4.0-3
+* Wed Jan 11 2012 Volker Fröhlich <volker27 at gmx.at> 1.5.0-1
+- Update for new release
+- Update URL and source URL
+- Correct license to GPLv3+
+- Drop patch for wxwidget (solved)
+- Use upstreams desktop file and icon
+- Don't modify linker flags anymore (solved)
+
+* 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