[packages/spatialite_gui] - up to 2.1.0-beta1

[baggins]

commit e2fb6c00ead4a8a0326ba7b8a59bf306409ada5f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Sep 29 10:07:21 2023 +0200

    - up to 2.1.0-beta1

 link.patch          | 11 -----------
 spatialite_gui.spec | 38 ++++++++++++--------------------------
 wxWidgets3.patch    | 11 -----------
 3 files changed, 12 insertions(+), 48 deletions(-)
---
diff --git a/spatialite_gui.spec b/spatialite_gui.spec
index 6db5905..4d1d8f8 100644
--- a/spatialite_gui.spec
+++ b/spatialite_gui.spec
@@ -1,14 +1,13 @@
 Summary:	Graphical User Interface tool supporting SpatiaLite
 Summary(pl.UTF-8):	Graficzny interfejs użytkownika obsługujący bazy SpatiaLite
 Name:		spatialite_gui
-Version:	1.7.1
-Release:	7
+%define	beta	beta1
+Version:	2.1.0
+Release:	0.%{beta}.1
 License:	GPL v3+
 Group:		Applications/Databases
-Source0:	http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/%{name}-%{version}.tar.gz
-# Source0-md5:	c917f40810607784528b4db58cd36efb
-Patch0:		wxWidgets3.patch
-Patch1:		link.patch
+Source0:	http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/%{name}-%{version}-%{beta}.tar.gz
+# Source0-md5:	9e8157f68c1f9ef77c31b229936b147f
 URL:		https://www.gaia-gis.it/fossil/spatialite_gui
 BuildRequires:	freexl-devel
 BuildRequires:	geos-devel
@@ -19,7 +18,8 @@ BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
 BuildRequires:	proj-devel >= 4
 BuildRequires:	sqlite3-devel
-BuildRequires:	wxGTK2-unicode-devel
+BuildRequires:	virtualpg-devel
+BuildRequires:	wxGTK3-unicode-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,22 +29,12 @@ Graphical User Interface tool supporting SpatiaLite.
 Graficzny interfejs użytkownika obsługujący bazy SpatiaLite.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-
-mkdir wx-bin
-ln -sf /usr/bin/wx-gtk2-unicode-config wx-bin/wx-config
+%setup -q -n %{name}-%{version}-%{beta}
 
 %build
-%{__aclocal} -I m4
-%{__automake}
-%{__autoconf}
-# configure refers to wx-config with no option to override
-PATH=$(pwd)/wx-bin:$PATH
-export CFLAGS="%{rpmcflags} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
-export CXXFLAGS="%{rpmcxxflags} -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
-%configure
+%configure \
+	--with-wxconfig=/usr/bin/wx-gtk3-unicode-config \
+	--disable-xlsxwriter
 
 %{__make}
 
@@ -54,10 +44,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-sed -ne '2,$p' gnome_resource/spatialite-gui.desktop >$RPM_BUILD_ROOT%{_desktopdir}/spatialite-gui.desktop
-cp -p gnome_resource/spatialite-gui.png $RPM_BUILD_ROOT%{_pixmapsdir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -65,4 +51,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/spatialite_gui
 %{_desktopdir}/spatialite-gui.desktop
-%{_pixmapsdir}/spatialite-gui.png
+%{_iconsdir}/hicolor/*x*/apps/spatialite-gui.png
diff --git a/link.patch b/link.patch
deleted file mode 100644
index 4a5b4e1..0000000
--- a/link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spatialite_gui-1.7.1/Makefile.am~	2013-06-29 08:29:11.000000000 +0000
-+++ spatialite_gui-1.7.1/Makefile.am	2015-07-19 08:55:38.773124523 +0000
-@@ -13,7 +13,7 @@
- 	TextCsv.cpp Wfs.cpp
- 
- LDADD = @WX_LIBS@ @LIBGAIAGRAPHICS_LIBS@ @LIBSPATIALITE_LIBS@ \
--	@LIBFREEXL_LIBS@ @LIBXML2_LIBS@
-+	@LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lsqlite3
- 
- EXTRA_DIST = Makefile-static-MinGW \
-         Makefile-static-Linux \
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
deleted file mode 100644
index cfc2fde..0000000
--- a/wxWidgets3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spatialite_gui-1.7.1/configure.ac~	2013-06-29 10:29:11.000000000 +0200
-+++ spatialite_gui-1.7.1/configure.ac	2014-01-18 17:23:07.978768701 +0100
-@@ -54,7 +54,7 @@
- fi
- CXXFLAGS="$(wx-config --cxxflags)"
- AM_CXXFLAGS="$(wx-config --cxxflags)"
--WX_LIBS="$(wx-config --libs)"
-+WX_LIBS="$(wx-config --libs) -lwx_gtk2u_aui-3.0"
- AC_SUBST(WX_LIBS)
- 
- # Checks for header files.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/spatialite_gui.git/commitdiff/e2fb6c00ead4a8a0326ba7b8a59bf306409ada5f