$ git diff --patch-with-stat --summary efab66c8f0cfa4f84006eb2d537167cd1bdd6d1c..f56f221c4ae0d2fa2d39092a4925f295e9d75069
.abf.yml | 2 +-
grass.spec | 82 ++++++++++++++++++++++----------------------------------------
2 files changed, 30 insertions(+), 54 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 5ab5d39..fea0f08 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,5 +1,5 @@
sources:
- grass-8.3.1.tar.gz: ba45c1c802b04b0ea5c16526700bc0457f935746
grass5_16.png: 9d43156320857508a75a21bef6d8da10e3febea3
grass5_32.png: d4736ebf029ca2f6966b7d7f1f2777152025908b
grass5_48.png: 4e85596ecb7399fdf4be6d760a7357e4c48d82c7
+ grass-8.3.2.tar.gz: c57b9ade1b3cdb953b2829f91c7cd4d7fe4bce44
diff --git a/grass.spec b/grass.spec
index 8dd4dd2..f3dc65d 100644
--- a/grass.spec
+++ b/grass.spec
@@ -3,9 +3,11 @@
%define __noautoprov '(.*)\\.so$|(.*)\\.so\\(\\)\\(64bit\\)$'
%endif
+%define short_ver %(echo %{version}|cut -d. -f 1,2 | sed -e 's/\\.//g')
+
Name: grass
-Version: 8.3.1
-Release: 1
+Version: 8.3.2
+Release: 3
Group: Sciences/Geosciences
Summary: Geographic Resources Analysis Support System
License: GPLv2+
@@ -25,16 +27,13 @@ BuildRequires: swig
BuildRequires: gd-devel >= 2.0
BuildRequires: gdal-devel
BuildRequires: gdbm-devel
+BuildRequires: gettext
BuildRequires: jpeg-devel
-#BuildRequires: lesstif-devel
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: proj proj-devel
BuildRequires: readline-devel
-BuildRequires: tcl tcl-devel
-BuildRequires: pkgconfig(ncursesw)
BuildRequires: tiff-devel
-BuildRequires: tk tk-devel
BuildRequires: unixODBC-devel
BuildRequires: pkgconfig(cairo)
@@ -44,19 +43,17 @@ BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(geos)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(xmu)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(pdal)
+BuildRequires: python-wxpython
# disabled ffmpeg support for now, since it has to be fixed upstream
#BuildRequires: ffmpeg-devel
-Requires: xterm
-Requires: tk
-Requires: tcl
+Requires: python-wxpython
%description
GRASS (Geographic Resources Analysis Support System) is an
@@ -73,54 +70,35 @@ through a graphical user interface and shell in X-Window.
%define __cputoolize true
%define Werror_cflags %nil
%configure --host=%{_host} \
-%if "%_lib" != "lib"
- --enable-64bit \
-%endif
- --with-dbm-includes=%{_includedir}/gdbm/ \
--with-postgres \
--with-postgres-includes=%{_includedir}/ \
--with-freetype \
--with-freetype-includes=%{_includedir}/freetype2 \
- --with-motif \
--with-cairo \
--with-opengl-libs=%{_libdir} \
- --with-motif-libs=%{_libdir} \
- --with-motif-libs=%{_libdir} \
- --with-motif-includes=%{_includedir} \
--with-gdal \
--with-geos \
--with-mysql --with-mysql-includes=%{_includedir}/mysql \
--with-odbc \
--enable-largefile \
- --with-curses \
- --with-python --with-wxwidgets="%{_bindir}/wx-config"\
--with-sqlite \
--with-cxx \
--with-proj-share=%{_datadir}/proj \
--with-nls \
--with-readline \
- --without-pdal \
# --with-ffmpeg --with-ffmpeg-includes="%{_includedir}/libavcodec \
# %{_includedir}/libavdevice \
# %{_includedir}/libavformat %{_includedir}/libavutil \
# %{_includedir}/libpostproc %{_includedir}/libswscale"
-%make
+%make_build
%install
-mkdir -p %{buildroot}/%{_bindir}
-# Actions in make install that don't take into account packaging in a place different to running:
-sed -e 's|^GISBASE.*|GISBASE=%{_libdir}/grass|' \
- bin.%{_target_platform}/grass > %{buildroot}/%{_bindir}/grass
-chmod a+x %{buildroot}/usr/bin/grass
-
-mkdir -p %{buildroot}/%{_libdir}/grass
-cp -a dist.%{_target_platform}/* %{buildroot}/%{_libdir}/grass
-
-# Add makefiles to includes:
-cp -a include/Make %{buildroot}/%{_libdir}/grass/include/
-mkdir %{buildroot}/%{_libdir}/grass/locks/
+%make_install \
+ DESTDIR=%{buildroot} \
+ prefix=%{_libdir} \
+ UNIX_BIN=%{_bindir}
mkdir -p %{buildroot}%{_iconsdir}/hicolor/{16x16,32x32,48x48}/apps
@@ -142,7 +120,7 @@ EOF
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/grass.conf << EOF
-%{_libdir}/grass/lib
+%{_libdir}/grass%{short_ver}/lib
EOF
%files
@@ -150,21 +128,19 @@ EOF
%{_sysconfdir}/ld.so.conf.d/*
%{_datadir}/applications/mandriva-%{name}.desktop
%{_iconsdir}/*/*/*/*
-%{_libdir}/grass/{AUTHORS,CHANGES,CITING,COPYING,GPL.txt,GPL.TXT,INSTALL.md,REQUIREMENTS.md,REQUIREMENTS.html}
-%{_libdir}/grass/grass.tmp
-%{_libdir}/grass/bin
-%{_libdir}/grass/contributors*
-%{_libdir}/grass/demolocation
-%{_libdir}/grass/docs
-%{_libdir}/grass/driver
-%{_libdir}/grass/etc
-%{_libdir}/grass/fonts
-%{_libdir}/grass/gui
-%{_libdir}/grass/include
-%{_libdir}/grass/lib
-%{_libdir}/grass/locale
-%{_libdir}/grass/scripts
-%{_libdir}/grass/share
-%{_libdir}/grass/translat*
-%{_libdir}/grass/utils
-%attr(1777,root,root) %{_libdir}/grass/locks
+%{_libdir}/grass%{short_ver}/{AUTHORS,CHANGES,CITING,COPYING,GPL.txt,GPL.TXT,INSTALL.md,REQUIREMENTS.md,REQUIREMENTS.html}
+%{_libdir}/grass%{short_ver}/bin
+%{_libdir}/grass%{short_ver}/contributors*
+%{_libdir}/grass%{short_ver}/demolocation
+%{_libdir}/grass%{short_ver}/docs
+%{_libdir}/grass%{short_ver}/driver
+%{_libdir}/grass%{short_ver}/etc
+%{_libdir}/grass%{short_ver}/fonts
+%{_libdir}/grass%{short_ver}/gui
+%{_libdir}/grass%{short_ver}/include
+%{_libdir}/grass%{short_ver}/lib
+%{_libdir}/grass%{short_ver}/locale
+%{_libdir}/grass%{short_ver}/scripts
+%{_libdir}/grass%{short_ver}/share
+%{_libdir}/grass%{short_ver}/translat*
+%{_libdir}/grass%{short_ver}/utils