Drop support for i686

the mariadb-connector-c-devel package is available for all RHEL versions
from version 8 and above, as version 7 is quite old this condition is
not necessary and all packages should use the BuildRequires of
mariadb-connector-c-devel instead of mysql-devel if possible

.gitignore

@@ -21,3 +21,10 @@
 /grass-8.0.2.tar.gz
 /grass-8.2.0.tar.gz
 /grass-8.2.1.tar.gz
+/grass-8.3.0.tar.gz
+/grass-.tar.gz
+/grass-8.3.1.tar.gz
+/grass-8.3.2.tar.gz
+/grass-8.4.0.tar.gz
+/grass-8.4.1.tar.gz
+/grass-8.4.2.tar.gz

grass.spec

@@ -1,9 +1,9 @@
-%global shortver 82
+%global shortver 84
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:		grass
-Version:	8.2.1
-Release:	1%{?dist}
+Version:	8.4.2
+Release:	3%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
@@ -29,7 +29,10 @@ URL:		https://grass.osgeo.org
 Source0:	https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz
 
 # fix pkgconfig file
-Patch0:		grass-pkgconfig.patch
+Patch 0:	grass-pkgconfig.patch
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
 
 BuildRequires:	bison
 %if %{with flexiblas}
@@ -37,51 +40,37 @@ BuildRequires:	flexiblas-devel
 %else
 BuildRequires:	blas-devel, lapack-devel
 %endif
+BuildRequires:	bzip2-devel
 BuildRequires:	cairo-devel
-BuildRequires:	gcc-c++
 BuildRequires:	desktop-file-utils
 BuildRequires:	fftw-devel
 BuildRequires:	flex
-%if (0%{?rhel} > 6 || 0%{?fedora})
 BuildRequires:	freetype-devel
-%endif
+BuildRequires:	gcc-c++
 BuildRequires:	gdal-devel
 BuildRequires:	geos-devel
 BuildRequires:	gettext
 BuildRequires:	laszip-devel
-%if (0%{?rhel} > 6 || 0%{?fedora})
 BuildRequires:	libappstream-glib
-%endif
 BuildRequires:	libpng-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libXmu-devel
-BuildRequires:	mesa-libGL-devel
-BuildRequires:	mesa-libGLU-devel
-%if (0%{?rhel} > 7 || 0%{?fedora})
-BuildRequires:	mariadb-connector-c-devel openssl-devel
-%else
-BuildRequires:	mysql-devel
-%endif
-%if (0%{?rhel} > 6 || 0%{?fedora})
-BuildRequires:	netcdf-devel
-%endif
-BuildRequires:	python3
-%if 0%{?rhel} == 7
-# EPEL7
-BuildRequires:	python%{python3_version_nodots}-numpy
-%else
-BuildRequires:	python3-numpy
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel} && 0%{?rhel} == 7
 BuildRequires:	postgresql-devel
 %else
 BuildRequires:	libpq-devel
 %endif
+BuildRequires:	libtiff-devel
+BuildRequires:	libXmu-devel
+BuildRequires:	libzstd-devel
+BuildRequires:	make
+BuildRequires:	mariadb-connector-c-devel openssl-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	mesa-libGLU-devel
+BuildRequires:	netcdf-devel
+BuildRequires:	PDAL
+BuildRequires:	PDAL-devel
+BuildRequires:	PDAL-libs
 BuildRequires:	proj-devel
-%if (0%{?rhel} <= 6 && !0%{?fedora})
-# argparse is included in python2.7+ but not python2.6
-BuildRequires:	python-argparse
-%endif
+BuildRequires:	python3
 %if 0%{?rhel} == 7
 # EPEL7
 BuildRequires:	python%{python3_version_nodots}-dateutil
@@ -89,65 +78,44 @@ BuildRequires:	python%{python3_version_nodots}-dateutil
 BuildRequires:	python3-dateutil
 %endif
 BuildRequires:	python3-devel
-%if (0%{?rhel} > 6 || 0%{?fedora})
-BuildRequires:	python3-pillow
+%if 0%{?rhel} == 7
+# EPEL7
+BuildRequires:	python%{python3_version_nodots}-numpy
 %else
-# EPEL6
-BuildRequires:	python-imaging
+BuildRequires:	python3-numpy
 %endif
-BuildRequires:	PDAL
-BuildRequires:	PDAL-libs
-BuildRequires:	PDAL-devel
+BuildRequires:	python3-pillow
 BuildRequires:	readline-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	subversion
 BuildRequires:	unixODBC-devel
 BuildRequires:	zlib-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	libzstd-devel
-BuildRequires: make
 
 Requires:	bzip2-libs
-Requires:	libzstd
 Requires:	geos
-# fedora >= 34: Nothing
-%if (0%{?rhel} > 7 || 0%{?fedora} < 34)
-Requires:	proj-datumgrid
-Requires:	proj-datumgrid-world
-%endif
+Requires:	libzstd
+Requires:	PDAL
+Requires:	PDAL-libs
 Requires:	python3
 %if 0%{?rhel} == 7
 # EPEL7
-Requires:	python%{python3_version_nodots}-numpy
-%else
-Requires:	python3-numpy
-%endif
-%if 0%{?rhel} > 6
-# EPEL7/EPEL8
-#Requires:  python3-matplotlib-wx
-%else
-Requires:	python3-matplotlib
-%endif
-%if 0%{?rhel} == 7
-# EPEL7
 Requires:	python%{python3_version_nodots}-dateutil
 %else
 Requires:	python3-dateutil
 %endif
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires: wxPython
+%if 0%{?rhel} == 7
+# EPEL7
+Requires:	python%{python3_version_nodots}-numpy
 %else
-Requires:	python3-wxpython4
+Requires:	python3-numpy
 %endif
-Requires:	PDAL
-Requires:	PDAL-libs
+Requires:	python3-wxpython4
 
 %if "%{_lib}" == "lib"
 %global cpuarch 32
 %else
 %global cpuarch 64
 %endif
-
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -180,7 +148,7 @@ GRASS GIS development headers
 
 %prep
 %setup -q
-%patch0 -p1 -b.libdir
+%patch 0 -p1 -b.libdir
 
 # Correct mysql_config query
 sed -i -e 's/--libmysqld-libs/--libs/g' configure
@@ -195,38 +163,27 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
 %build
 %configure \
 	--prefix=%{_libdir} \
+	--with-blas \
+%if %{with flexiblas}
+	--with-blas-includes=%{_includedir}/flexiblas \
+%endif
+	--with-bzlib \
+	--with-cairo \
+	--with-cairo-ldflags=-lfontconfig \
 	--with-cxx \
-	--with-tiff \
-	--with-png \
-	--with-postgres \
+	--with-fftw \
+	--with-freetype \
+	--with-freetype-includes=%{_includedir}/freetype2 \
+	--with-gdal=%{_bindir}/gdal-config \
+	--with-geos=%{_bindir}/geos-config \
+	--with-lapack \
+%if %{with flexiblas}
+	--with-lapack-includes=%{_includedir}/flexiblas \
+%endif
 %if 0%{?rhel} > 7
 	--with-mysql=no \
 %else
 	--with-mysql \
-%endif
-	--with-opengl \
-	--with-odbc \
-	--with-fftw \
-	--with-blas \
-	--with-lapack \
-%if %{with flexiblas}
-	--with-blas-includes=%{_includedir}/flexiblas \
-	--with-lapack-includes=%{_includedir}/flexiblas \
-%endif
-	--with-cairo \
-%if (0%{?rhel} > 6 || 0%{?fedora})
-	--with-freetype \
-%endif
-	--with-nls \
-	--with-pdal \
-	--with-readline \
-	--with-regex \
-	--with-openmp \
-	--with-gdal=%{_bindir}/gdal-config \
-	--with-wxwidgets=%{_bindir}/wx-config \
-	--with-geos=%{_bindir}/geos-config \
-%if (0%{?rhel} > 6 || 0%{?fedora})
-	--with-netcdf=%{_bindir}/nc-config \
 %endif
 	--with-mysql-includes=%{_includedir}/mysql \
 %if (0%{?fedora} >= 27)
@@ -234,12 +191,22 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
 %else
 	--with-mysql-libs=%{_libdir}/mysql \
 %endif
+	--with-netcdf=%{_bindir}/nc-config \
+	--with-nls \
+	--with-odbc \
+	--with-opengl \
+	--with-openmp \
+	--with-pdal \
+	--with-png \
+	--with-postgres \
 	--with-postgres-includes=%{_includedir}/pgsql \
-	--with-cairo-ldflags=-lfontconfig \
-	--with-freetype-includes=%{_includedir}/freetype2 \
-	--with-bzlib \
-	--with-zstd \
-	--with-proj-share=%{_datadir}/proj
+	--with-proj-share=%{_datadir}/proj \
+	--with-readline \
+	--with-regex \
+	--with-tiff \
+	--with-wxwidgets=%{_bindir}/wx-config \
+	--with-zstd
+
 
 # .package_note hack for RHBZ #2084342 and RHBZ #2102895
 sed -i "s+ -Wl,-dT,${RPM_BUILD_DIR}/grass-%{version}/.package_note-grass-%{version}-%{release}.%{_arch}.ld++g" include/Make/Platform.make
@@ -316,7 +283,7 @@ cat >  %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf<<EOF
 %{_libdir}/%{name}%{shortver}/lib
 EOF
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
+%if 0%{?rhel} && 0%{?rhel} == 7
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -349,10 +316,9 @@ fi
 %{_docdir}/%{name}%{shortver}
 
 %files libs
-%license AUTHORS COPYING GPL.TXT CHANGES
+%license AUTHORS COPYING GPL.TXT
 %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_libdir}/%{name}%{shortver}/lib/*.so
-%{_libdir}/%{name}%{shortver}/lib/*.a
 %dir %{_libdir}/%{name}%{shortver}/driver
 %dir %{_libdir}/%{name}%{shortver}/driver/db
 %{_libdir}/%{name}%{shortver}/driver/db/*
@@ -368,6 +334,105 @@ fi
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Wed Jan 14 2026 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 8.4.2-3
+- Drop support for i686
+
+* Sun Nov 23 2025 Sandro Mani <manisandro@gmail.com> - 8.4.2-2
+- Rebuild (gdal)
+
+* Sun Nov 23 2025 Markus Neteler <neteler@mundialis.de> - 8.4.2-1
+- Update to GRASS 8.4.2 (#2416357)
+
+* Sat Sep 27 2025 Markus Neteler <neteler@mundialis.de> - 8.4.1-8
+- Rebuilt for F43
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 8.4.1-7
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Fri Aug 22 2025 Orion Poplawski <orion@nwra.com> - 8.4.1-6
+- Rebuild for netcdf 4.9.3 soname bump
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 8.4.1-5
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Sun Aug 03 2025 Sandro Mani <manisandro@gmail.com> - 8.4.1-4
+- Rebuild (PDAL)
+
+* Wed Jul 30 2025 Sandro Mani <manisandro@gmail.com> - 8.4.1-3
+- Rebuild (gdal)
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Feb 24 2025 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.4.1-1
+- Update to 8.4.1 (#2347356)
+
+* Sat Feb 22 2025 Markus Neteler <neteler@mundialis.de> - 8.4.0-7
+- drop outdated proj-datumgrid condition
+
+* Mon Feb 10 2025 Markus Neteler <neteler@mundialis.de> - 8.4.0-6
+- EPEL10: fix proj-datumgrid condition
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Nov 09 2024 Sandro Mani <manisandro@gmail.com> - 8.4.0-4
+- Rebuild (gdal)
+
+* Sat Oct 26 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-3
+- Sort requirements and flags (https://github.com/OSGeo/grass/pull/4563/ by Edouard Choinière)
+
+* Fri Sep 06 2024 Sandro Mani <manisandro@gmail.com> - 8.4.0-2
+- Rebuild (PDAL)
+
+* Sun Jul 28 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-1
+- Update to 8.4.0
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue May 14 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-3
+- Rebuild (gdal)
+
+* Tue Mar 19 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-2
+- Rebuild (PDAL)
+
+* Thu Mar 07 2024 Markus Neteler <neteler@mundialis.de> - 8.3.2-1
+- Update to 8.3.2 (#2268514)
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan  3 2024 Florian Weimer <fweimer@redhat.com> - 8.3.1-4
+- Fix C compatibility issue in MySQL port handling
+
+* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 8.3.1-3
+- Rebuild (gdal)
+
+* Sat Oct 28 2023 Markus Neteler <neteler@mundialis.de> 8.3.1-2
+- fix obsolete configure parameters
+
+* Thu Oct 26 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.3.1-1
+- Update to GRASS GIS 8.3.1 (#2246359)
+
+* Sat Oct 14 2023 Sandro Mani <manisandro@gmail.com> - 8.3.0-4
+- Rebuild (PDAL)
+
+* Sun Aug 06 2023 Alexandre Detiste <alexandre.detiste@gmail.com> - 8.3.0-3
+- Remove support for RHEL6: Grass is now Python3 only
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jun 25 2023 Markus Neteler <neteler@mundialis.de> 8.3.0-1
+- New upstream version GRASS GIS 8.3.0
+
+* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 8.2.1-2
+- Rebuild (gdal)
+
 * Sat Jan 21 2023 Markus Neteler <neteler@mundialis.de> 8.2.1-1
 - New upstream version GRASS GIS 8.2.1
 

sources

@@ -1 +1 @@
-SHA512 (grass-8.2.1.tar.gz) = 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
+SHA512 (grass-8.4.2.tar.gz) = bbbe219b0d4a7075374c7f8b11de838f014ea0bce84a22dc9089d65fe49fd4f41d8e39867f08fa12ab46e8ff883389c22ccb9976ef89c2fed24834d1ba5cf6fb