Compare commits

...
Sign in to create a new pull request.

98 commits

Author SHA1 Message Date
Elliott Sales de Andrade
398edf0a84 Drop support for i686 2026-01-14 19:09:15 -05:00
Sandro Mani
05e0b149d2 Rebuild (gdal) 2025-11-23 22:37:38 +01:00
Markus Neteler
72396d5007 Update to GRASS 8.4.2 (#2416357) 2025-11-23 15:38:17 +01:00
Markus Neteler
8ac5aa690e Rebuilt for F43 (#2396704) 2025-09-27 18:34:32 +02:00
Python Maint
e64ca5da4b Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 12:20:41 +02:00
Orion Poplawski
96a58932e1 Rebuild for netcdf 4.9.3 soname bump 2025-08-22 08:39:01 -06:00
Python Maint
6b9a9250a8 Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 12:51:02 +02:00
Sandro Mani
cfcf1c3780 Fix changelog entry 2025-08-03 21:18:33 +02:00
Sandro Mani
958d42b7fe Rebuild (grass) 2025-08-03 20:56:10 +02:00
Sandro Mani
949a64e771 Rebuild (gdal) 2025-07-30 08:56:29 +02:00
Fedora Release Engineering
cb7e5cafb8 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 16:35:49 +00:00
Pavol Sloboda
42c0b3fa98 cleanup: cleaned the BuildRequires of mysql-devel package
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
2025-04-16 14:26:28 +02:00
Markus Neteler
38a79d7b34 Add grass-8.4.1.tar.gz 2025-02-25 15:02:20 +01:00
Markus Neteler
56cb9ca33c Update to GRASS GIS 8.4.1 2025-02-25 14:15:02 +01:00
Markus Neteler
ba918ec6e9 Merge branch 'epel10' into rawhide 2025-02-25 13:17:14 +01:00
Markus Neteler
af4574c087 drop outdated proj-datumgrid condition 2025-02-22 19:03:43 +01:00
Markus Neteler
4d7489beee EPEL10: fix proj-datumgrid condition 2025-02-10 17:04:04 +01:00
Markus Neteler
be3b12a262 EPEL10: fix proj-datumgrid condition 2025-02-10 17:03:00 +01:00
Markus Neteler
38f6e4314f Merge branch 'rawhide' into epel10 2025-02-10 16:32:26 +01:00
Fedora Release Engineering
f6c317a854 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 05:08:05 +00:00
Markus Neteler
bc3774acd7 Merge branch 'rawhide' into epel10 2024-12-03 07:49:33 +01:00
Sandro Mani
d4715aa6a1 Rebuild (gdal) 2024-11-09 08:47:20 +01:00
Markus Neteler
d4ca6db195 Sort requirements and flags (https://github.com/OSGeo/grass/pull/4563/ by Edouard Choinière) 2024-10-26 23:01:50 +02:00
Markus Neteler
1da2db5af0 Merge branch 'main' into epel10 2024-10-15 15:56:18 +02:00
Markus Neteler
d86aa024c1 Merge remote-tracking branch 'origin/f41' into epel10 2024-10-15 15:56:02 +02:00
Markus Neteler
6a2631f644 New EPEL10 branch 2024-10-15 15:45:15 +02:00
Markus Neteler
665d05df72 Remove unrelated CHANGES file from license macro 2024-09-17 17:39:54 +02:00
Sandro Mani
f4fe1ca843 Rebuild (PDAL) 2024-09-06 20:31:32 +02:00
Markus Neteler
855271be24 Update to GRASS GIS 8.4.0 2024-07-28 21:14:07 +02:00
Fedora Release Engineering
5ec0f30c8b Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 08:33:19 +00:00
Sandro Mani
9860162dd4 Rebuild (gdal) 2024-05-14 15:32:22 +02:00
Sandro Mani
9b08658ff6 Rebuild (grass) 2024-03-19 11:51:21 +01:00
Markus Neteler
ba342d78b3 Update to GRASS GIS 8.3.2 (#2268514) 2024-03-08 10:32:14 +01:00
Fedora Release Engineering
0e710f0d0a Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 20:59:29 +00:00
Fedora Release Engineering
e840ecbbeb Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-20 21:28:27 +00:00
Florian Weimer
51551285c8 Fix C compatibility issue in MySQL port handling
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2024-01-03 20:19:02 +01:00
Sandro Mani
479fe22755 Rebuild (gdal) 2023-11-15 18:29:31 +01:00
Markus Neteler
4d5fa75ad6 fix obsolete configure parameters 2023-10-28 19:34:41 +02:00
Markus Neteler
5d238445c3 Update to 8.3.1 (#2246359) 2023-10-26 14:26:20 +02:00
Sandro Mani
8860870ecc Rebuild (PDAL) 2023-10-15 00:20:17 +02:00
Alexandre Detiste
d7481826c1 remove support for RHEL6 2023-08-06 19:05:09 +02:00
Fedora Release Engineering
8381e3510b Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 05:32:07 +00:00
Markus Neteler
7a7ffd7e35 New upstream version GRASS GIS 8.3.0 (RHBZ # 2217231) 2023-06-25 17:44:51 +02:00
Sandro Mani
a4e4073d0d Rebuild (gdal) 2023-05-11 14:39:02 +02:00
Markus Neteler
513c0a7543 New upstream version GRASS GIS 8.2.1 2023-01-21 21:25:50 +01:00
Fedora Release Engineering
7b2f1a4d4f Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 11:29:38 +00:00
Sandro Mani
0faccf720f Drop CFLAGS/CXXFLAGS override 2023-01-19 09:03:54 +01:00
Markus Neteler
98450685e2 replace grass-pdal.patch
Use fix: https://github.com/OSGeo/grass/pull/2749
2023-01-16 21:15:47 +01:00
Sandro Mani
e9fa538502 Update grass-pdal.patch 2023-01-14 22:21:29 +01:00
Sandro Mani
d672671634 Fix PDAL detection 2023-01-14 21:18:44 +01:00
Sandro Mani
2d754e9a74 Rebuild (PDAL) 2023-01-14 20:26:38 +01:00
Sandro Mani
30ebcb4abe Rebuild (gdal) 2022-11-12 18:59:25 +01:00
Markus Neteler
7a346860d1 SPDX license tag update 2022-11-09 15:45:58 +01:00
Markus Neteler
65f12df9df fix RPM ARCH not defined for GRASS GIS addon installation (RHBZ #2138373) 2022-11-03 17:06:44 +01:00
Markus Neteler
bd14b8e23f Fix unexpected keyword argument 'codeset' (Python 3.11) for RHBZ #2126608 2022-09-17 18:37:59 +02:00
Markus Neteler
a6030f684e Rebuild for RHBZ #2107826 (PYC magic number has changed) 2022-08-08 15:38:58 +02:00
Fedora Release Engineering
eba7ceca74 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 12:59:50 +00:00
Markus Neteler
bdb2ea2ec9 .package_note hack (RHBZ #2084342 + RHBZ #2102895) 2022-07-11 12:04:12 +02:00
Markus Neteler
813a632f98 New upstream version GRASS GIS 8.2.0 2022-06-04 12:07:12 +02:00
Sandro Mani
a64639171d Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 2022-05-21 17:59:34 +02:00
Markus Neteler
bb06a8fa68 New upstream version GRASS GIS 8.0.2 2022-05-12 17:50:29 +02:00
Markus Neteler
f10ae78e04 Rebuild for pdal-2.4.0 2022-03-29 19:11:21 +02:00
Sandro Mani
0046a622f5 Rebuild for proj-9.0.0 2022-03-10 13:42:04 +01:00
Markus Neteler
75d93c82e9 New upstream version GRASS GIS 8.0.1 2022-02-24 23:24:25 +01:00
Markus Neteler
0ee3c7b64d New upstream version GRASS GIS 8.0.0 2022-01-28 20:53:55 +01:00
Fedora Release Engineering
e00e7744c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 11:45:04 +00:00
Sandro Mani
792f6a075c Rebuild (gdal) 2021-11-11 12:06:56 +01:00
Björn Esser
72e22bce2e
Add actual patch to repo
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
2021-11-07 10:23:31 +01:00
Björn Esser
4736442e91
Add patch to fix installation path in pkgconfig file
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
2021-11-07 10:03:38 +01:00
Markus
85710b061d New upstream version GRASS GIS 7.8.6 (RHBZ #2012725)
Details: https://trac.osgeo.org/grass/wiki/Release/7.8.6-News
2021-11-03 16:49:39 +01:00
Sandro Mani
4b3701dd71 Rebuild (geos) 2021-10-21 11:20:15 +02:00
Orion Poplawski
452efd8841 Rebuild for netcdf 4.8.0 2021-08-09 20:24:05 -06:00
Fedora Release Engineering
1c52e2ad49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 07:04:26 +00:00
Markus
33ecbbb562 fix ctypes for Python 3.10 (RHBZ #1973621) 2021-06-21 19:33:36 +02:00
Markus
f1e887cb4f drop old .rpmlint; fix macro in changelog comment 2021-06-21 10:18:49 +02:00
Sandro Mani
db901bd2f5 Apply patch2 2021-05-10 10:58:19 +02:00
Sandro Mani
53269fe83d Add grass-bool.patch 2021-05-10 10:57:58 +02:00
Sandro Mani
eeabb04687 Rebuild (gdal) 2021-05-07 12:12:10 +02:00
Sandro Mani
3673c3b546 Bump 2021-03-24 01:54:27 +01:00
Sandro Mani
7164e4a3d7 Rebuild (proj) 2021-03-07 11:12:40 +01:00
Sandro Mani
90bace3000 Rebuild (geos) 2021-02-13 18:25:31 +01:00
Pavel Raiskup
a88e49fa78 rebuild for libpq ABI fix
Related: rhbz#1908268
2021-02-08 09:27:53 +01:00
Fedora Release Engineering
07318cf069 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 12:56:00 +00:00
Markus
07d514a545 New upstream version GRASS GIS 7.8.5 (RHBZ #1909914) 2020-12-22 14:50:47 +01:00
Markus
692861e960 New upstream version GRASS GIS 7.8.5 (RHBZ #1909914) 2020-12-22 13:12:48 +01:00
Tom Stellard
95c269c73c Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-19 00:04:47 +00:00
Markus
4bf974e362 Clean up proj-datumgrid requires < f34+ (fixes RHBZ #1900612) 2020-11-24 21:38:33 +01:00
Sandro Mani
9d7d93ebd7 Drop proj-datumgrid requires on f34+ 2020-11-20 16:00:41 +01:00
Sandro Mani
065f85e05c Drop proj datumgrid BRs 2020-11-12 14:35:48 +01:00
Sandro Mani
ddcb20d173 Rebuild (proj, gdal) 2020-11-12 13:41:27 +01:00
Sandro Mani
cab3b5704d Rebuild (PDAL) 2020-11-04 18:22:51 +01:00
Markus
0708b74366 Reinstate grass/config.h (RHBZ #1889035) as being needed for QGIS 2020-10-17 13:58:45 +02:00
Markus
7a9c098c8a New upstream version GRASS GIS 7.8.4
Fixes BZ#1885210
2020-10-05 18:46:45 +02:00
Iñaki Úcar
3fc5c8c29f https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager 2020-08-27 14:40:59 +02:00
Fedora Release Engineering
f4b8639df9 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 03:22:02 +00:00
Fedora Release Engineering
c3d51600e2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 00:19:17 +00:00
Markus
22a1dcda01 added PDAL support (#BZ1672170) 2020-06-26 23:52:51 +02:00
Markus
721eff9efe disable automagic byte compilation (BZ#1847153) 2020-06-21 21:34:53 +02:00
9 changed files with 385 additions and 313 deletions

15
.gitignore vendored
View file

@ -13,3 +13,18 @@
/grass-7.8.1.tar.gz
/grass-7.8.2.tar.gz
/grass-7.8.3.tar.gz
/grass-7.8.4.tar.gz
/grass-7.8.5.tar.gz
/grass-7.8.6.tar.gz
/grass-8.0.0.tar.gz
/grass-8.0.1.tar.gz
/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

View file

@ -1,3 +0,0 @@
from Config import *
addFilter("spelling-error .* (runtime|spatial)");
addFilter("name-repeased-in-summary .* GRASS");

View file

@ -1,23 +0,0 @@
diff -up grass-7.8.0/include/Make/Install.make.sopwith grass-7.8.0/include/Make/Install.make
--- grass-7.8.0/include/Make/Install.make.sopwith 2019-09-13 15:07:19.127928851 -0400
+++ grass-7.8.0/include/Make/Install.make 2019-09-13 15:25:55.583419717 -0400
@@ -91,6 +91,10 @@ else
STARTUP = $(UNIX_BIN)/$(GRASS_NAME)
endif
+ifndef GISBASE_RUNTIME
+GISBASE_RUNTIME=$(INST_DIR)
+endif
+
FONTCAP = etc/fontcap
TMPGISRC = demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
PLATMAKE = include/Make/Platform.make
@@ -125,7 +129,7 @@ $(INST_DIR) $(UNIX_BIN):
$(MAKE_DIR_CMD) $@
$(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
- sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
+ sed -e 's#'@GISBASE@'#'$(GISBASE_RUNTIME)'#g' \
-e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
-e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
$< > $@

View file

@ -1,11 +0,0 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "grass/config-32.h"
#else
#if __WORDSIZE == 64
#include "grass/config-64.h"
#else
#error "Unknown word size"
#endif
#endif

24
grass-pkgconfig.patch Normal file
View file

@ -0,0 +1,24 @@
diff --git a/grass.pc.in b/grass.pc.in
index 94ca57b65..aec77d095 100644
--- a/grass.pc.in
+++ b/grass.pc.in
@@ -2,13 +2,13 @@
#
# See also: grass --config
-prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
-exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
+prefix=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+exec_prefix=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+libdir=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
+includedir=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
Name: GRASS
Description: GRASS GIS
Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
+Libs: -L@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
+Cflags: -I@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include

View file

@ -1,15 +1,15 @@
# This package depends on automagic byte compilation
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
%global _python_bytecompile_extra 1
%global shortver 78
%global shortver 84
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: grass
Version: 7.8.3
Release: 5%{?dist}
Version: 8.4.2
Release: 3%{?dist}
Summary: GRASS GIS - Geographic Resources Analysis Support System
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%bcond_without flexiblas
%endif
%if 0%{?rhel} >= 7
%define __python %{__python3}
%global python3_version_nodots 36
@ -20,69 +20,57 @@ Summary: GRASS GIS - Geographic Resources Analysis Support System
# "%%bcond_without" means "ENABLE by default and create a --without option"
%bcond_without python3
License: GPLv2+
# GRASS GIS addon reuses the compiler flags originating from rpmbuild environment,
# hence disabling package-notes plugin
%undefine _package_note_file
License: GPL-2.0-or-later
URL: https://grass.osgeo.org
Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz
Source2: %{name}-config.h
Patch1: grass-7.8.0-buildroot.diff
# fix pkgconfig file
Patch 0: grass-pkgconfig.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
BuildRequires: bison
BuildRequires: blas-devel
%if %{with flexiblas}
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: lapack-devel
%if (0%{?rhel} > 6 || 0%{?fedora})
BuildRequires: laszip-devel
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} > 7 || 0%{?fedora} >= 30)
BuildRequires: proj-datumgrid
%else
BuildRequires: proj-epsg
BuildRequires: proj-nad
%endif
%if 0%{?fedora} >= 30
BuildRequires: proj-datumgrid-world
%endif
%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
@ -90,63 +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: python3-pillow
BuildRequires: readline-devel
BuildRequires: sqlite-devel
BuildRequires: subversion
BuildRequires: unixODBC-devel
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: libzstd-devel
Requires: bzip2-libs
Requires: libzstd
Requires: geos
%if (0%{?rhel} > 7 || 0%{?fedora} >= 30)
Requires: proj-datumgrid
%else
Requires: proj-epsg
Requires: proj-nad
%endif
%if 0%{?fedora} >= 30
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: python3-wxpython4
%if "%{_lib}" == "lib"
%global cpuarch 32
%else
%global cpuarch 64
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description
@ -179,47 +148,42 @@ GRASS GIS development headers
%prep
%setup -q
%patch1 -p1
%patch 0 -p1 -b.libdir
# Correct mysql_config query
sed -i -e 's/--libmysqld-libs/--libs/g' configure
%if %{with flexiblas}
sed -i -e 's/-lblas/-lflexiblas/g' -e 's/-llapack/-lflexiblas/g' configure
%endif
# Fixup shebangs
find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
%build
# Package is not ready for -Werror=format-security or the C++11 standard
CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's/ -Werror=format-security//')"
CXXFLAGS="-std=c++98 ${CFLAGS}"
%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 \
--with-mysql=no \
%else
--with-mysql \
%endif
--with-opengl \
--with-odbc \
--with-fftw \
--with-blas \
--with-lapack \
--with-cairo \
%if (0%{?rhel} > 6 || 0%{?fedora})
--with-freetype \
%endif
--with-nls \
--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)
@ -227,12 +191,25 @@ CXXFLAGS="-std=c++98 ${CFLAGS}"
%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
make %{?_smp_mflags}
@ -240,30 +217,16 @@ make %{?_smp_mflags}
# this is not FHS compliant: hide grass-%%{version} in %%{libdir}
%install
%make_install \
DESTDIR=%{buildroot}%{_libdir} \
prefix=%{buildroot}%{_libdir} \
UNIX_BIN=%{buildroot}%{_bindir} \
DESTDIR=%{buildroot} \
prefix=%{_libdir} \
UNIX_BIN=%{_bindir} \
GISBASE_RUNTIME=%{_libdir}/%{name}%{shortver}
# libraries and headers are in GISBASE = %%{_libdir}/%%{name}
# keep them in GISBASE
# fix paths:
# Change GISBASE in startup script
for I in %{buildroot}%{_bindir}/%{name}%{shortver} \
%{buildroot}%{_libdir}/%{name}%{shortver}/include/Make/Platform.make \
%{buildroot}%{_libdir}/%{name}%{shortver}/include/Make/Grass.make \
%{buildroot}%{_libdir}/%{name}%{shortver}/demolocation/.grassrc%{shortver} \
%{buildroot}%{_libdir}/%{name}%{shortver}/etc/fontcap; do
sed -i \
-e 's|%{buildroot}%{_libdir}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \
-e 's|%{buildroot}%{_libdir}/%{name}%{shortver}|%{_libdir}/%{name}%{shortver}|g' \
-e 's|%{buildroot}%{_bindir}|%{_bindir}|g' \
$I
done
# fix paths in grass.pc
sed -i -e 's|%{_prefix}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \
sed -i -e 's|%{_libdir}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \
%{name}.pc
mkdir -p %{buildroot}%{_libdir}/pkgconfig
@ -272,7 +235,18 @@ install -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig
# Create multilib header
mv %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h \
%{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config-%{cpuarch}.h
install -p -m 644 %{SOURCE2} %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h
echo '#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "grass/config-32.h"
#else
#if __WORDSIZE == 64
#include "grass/config-64.h"
#else
#error "Unknown word size"
#endif
#endif' > %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h
chmod 644 %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h
# Make man pages available on the system, convert to utf8 and avoid name conflict
mkdir -p %{buildroot}%{_mandir}/man1
@ -281,9 +255,6 @@ do
iconv -f iso8859-1 -t utf8 $man > %{buildroot}%{_mandir}/man1/$(basename $man)"%{name}"
done
# create symlink to unversioned name
ln -s %{_bindir}/%{name}%{shortver} %{buildroot}%{_bindir}/%{name}
# symlink docs from GISBASE to standard system location
mkdir -p %{buildroot}%{_docdir}
# append shortver to destination since man pages are unversioned
@ -298,7 +269,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.osge
#rm -rf %%{buildroot}%%{_prefix}/%%{name}-%%{version}
# Finally move entire tree to shortver subdir
#mv %{buildroot}%{_libdir}/%{name}-%{version} %{buildroot}%{_libdir}/%{name}%{shortver}
#mv %%{buildroot}%%{_libdir}/%%{name}-%%{version} %%{buildroot}%%{_libdir}/%%{name}%%{shortver}
# rpm macro for version checking (not from buildroot!)
mkdir -p ${RPM_BUILD_ROOT}%{macrosdir}
@ -312,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 || :
@ -345,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/*
@ -357,13 +327,246 @@ fi
%{_libdir}/%{name}%{shortver}/gui
%files devel
%doc TODO doc/* SUBMITTING
%doc TODO doc/* CONTRIBUTING.md
%{macrosdir}/macros.%{name}
%{_libdir}/pkgconfig/*
%dir %{_libdir}/%{name}%{shortver}/lib
%{_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
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Jan 16 2023 Markus Neteler <neteler@mundialis.de> 8.2.0-10
- modify grass-pdal.patch for alternative C++ fix
* Sat Jan 14 2023 Sandro Mani <manisandro@gmail.com> - 8.2.0-9
- Rebuild (PDAL)
* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 8.2.0-8
- Rebuild (gdal)
* Wed Nov 09 2022 Markus Neteler <neteler@mundialis.de> 8.2.0-7
- SPDX license tag update
* Thu Nov 03 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-6
- fix RPM ARCH not defined for GRASS GIS addon installation (RHBZ #2138373)
* Sat Sep 17 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-5
- fix unexpected keyword argument 'codeset' (Python 3.11) for RHBZ #2126608
* Mon Aug 08 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-4
- Rebuild for RHBZ #2107826 (PYC magic number has changed)
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jul 11 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-2
- .package_note hack for RHBZ #2084342 and RHBZ #2102895
* Sat Jun 04 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-1
- New upstream version GRASS GIS 8.2.0
* Sat May 21 2022 Sandro Mani <manisandro@gmail.com> - 8.0.2-2
- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
* Thu May 12 2022 Markus Neteler <neteler@mundialis.de> - 8.0.2-1
- New upstream version GRASS GIS 8.0.2
* Tue Mar 29 2022 Markus Neteler <neteler@mundialis.de> - 8.0.1-3
- Rebuild for pdal-2.4.0
* Thu Mar 10 2022 Sandro Mani <manisandro@gmail.com> - 8.0.1-2
- Rebuild for proj-9.0.0
* Thu Feb 24 2022 Markus Neteler <neteler@mundialis.de> - 8.0.1-1
- New upstream version GRASS GIS 8.0.1
* Fri Jan 28 2022 Markus Neteler <neteler@mundialis.de> - 8.0.0-1
- New upstream version GRASS GIS 8.0.0
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 7.8.6-3
- Rebuild (gdal)
* Sun Nov 07 2021 Björn Esser <besser82@fedoraproject.org> - 7.8.6-2
- Add patch to fix installation path in pkgconfig file
* Tue Nov 02 2021 Markus Neteler <neteler@mundialis.de> - 7.8.6-1
- New upstream version GRASS GIS 7.8.6
* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-11
- Rebuild (geos)
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 7.8.5-10
- Rebuild for netcdf 4.8.0
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jun 21 2021 Markus Neteler <neteler@mundialis.de> - 7.8.5-8
- fix ctypes for Python 3.10 (RHBZ #1973621)
* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-7
- Rebuild (gdal)
* Wed Mar 24 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-6
- Bump
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-5
- Rebuild (proj)
* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-4
- Rebuild (geos)
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 7.8.5-3
- rebuild for libpq ABI fix rhbz#1908268
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 22 2020 Markus Neteler <neteler@mundialis.de> - 7.8.5-1
- New upstream version GRASS GIS 7.8.5
* Tue Nov 24 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-6
- Clean up proj-datumgrid requires < f34+
* Fri Nov 20 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-5
- Drop proj-datumgrid requires on f34+
* Fri Nov 6 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-4
- Rebuild (proj, gdal)
* Wed Nov 4 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-3
- Rebuild (PDAL)
* Sat Oct 17 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-2
- reinstate %%{name}-config.h (RHBZ #1889035) as being needed for QGIS
* Mon Oct 05 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-1
- New upstream version GRASS GIS 7.8.4
- disabled %%{name}-config.h
* Thu Aug 27 2020 Iñaki Úcar <iucar@fedoraproject.org> - 7.8.3-10
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.3-9
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 26 2020 Markus Neteler <neteler@mundialis.de> - 7.8.3-7
- added PDAL support
* Sun Jun 21 2020 Markus Neteler <neteler@mundialis.de> - 7.8.3-6
- disable automagic byte compilation (BZ#1847153)
* Tue May 26 2020 Markus Neteler <neteler@mundialis.de> - 7.8.3-5
- fixed wxPython for F33 (BZ#1836761)

View file

@ -1,90 +0,0 @@
Index: grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py
===================================================================
--- grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71218)
+++ grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71219)
@@ -1,59 +1,8 @@
# lextab.py. This file automatically created by PLY (version 2.2). Don't edit!
-_lextokens = {
- 'RIGHT_OP': None,
- 'RIGHT_ASSIGN': None,
- 'DEC_OP': None,
- 'PP_MACRO_PARAM': None,
- 'DIV_ASSIGN': None,
- 'PP_DEFINE': None,
- 'PP_END_DEFINE': None,
- 'PP_DEFINE_MACRO_NAME': None,
- 'HEADER_NAME': None,
- 'NEWLINE': None,
- 'CHARACTER_CONSTANT': None,
- 'PP_STRINGIFY': None,
- 'AND_ASSIGN': None,
- 'PTR_OP': None,
- 'ELLIPSIS': None,
- 'IDENTIFIER': None,
- 'ADD_ASSIGN': None,
- 'PERIOD': None,
- 'AND_OP': None,
- 'OTHER': None,
- 'LPAREN': None,
- 'LEFT_OP': None,
- 'LE_OP': None,
- 'OR_OP': None,
- 'SUB_ASSIGN': None,
- 'MOD_ASSIGN': None,
- 'STRING_LITERAL': None,
- 'PP_IDENTIFIER_PASTE': None,
- 'PP_NUMBER': None,
- 'PP_DEFINE_NAME': None,
- 'XOR_ASSIGN': None,
- 'OR_ASSIGN': None,
- 'GE_OP': None,
- 'MUL_ASSIGN': None,
- 'LEFT_ASSIGN': None,
- 'INC_OP': None,
- 'NE_OP': None,
- 'EQ_OP': None}
-_lexreflags = 0
-_lexliterals = ''
+_lextokens = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None}
+_lexreflags = 0
+_lexliterals = ''
_lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'}
-_lexstatere = {
- 'INITIAL': [
- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
- None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [
- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [
- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
- None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [
- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
+_lexstatere = {'INITIAL': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
_lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'}
_lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'}
Index: grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py
===================================================================
--- grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71218)
+++ grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71219)
@@ -53,5 +53,5 @@
'H': '[a-fA-F0-9]',
'E': '[Ee][+-]?\s*{D}+',
- 'FS': '[FflL]',
+ 'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)',
'IS': '[uUlL]*',
}
@@ -227,8 +227,8 @@
suf = m.group("suf")
- if dp or exp or (suf and suf in ("Ff")):
+ if dp or exp or (suf and suf not in ("Ll")):
s = m.group(0)
if suf:
- s = s[:-1]
+ s = s[:-len(suf)]
# Attach a prefix so the parser can figure out if should become an
# integer, float, or long

View file

@ -1,43 +0,0 @@
Index: grass-7.2.2/lib/raster/get_row.c
===================================================================
--- grass-7.2.2/lib/raster/get_row.c (revision 71935)
+++ grass-7.2.2/lib/raster/get_row.c (revision 71944)
@@ -15,6 +15,4 @@
#include <unistd.h>
#include <sys/types.h>
-
-#include <rpc/types.h> /* need this for sgi */
#include <grass/config.h>
Index: grass-7.2.2/lib/raster/open.c
===================================================================
--- grass-7.2.2/lib/raster/open.c (revision 71935)
+++ grass-7.2.2/lib/raster/open.c (revision 71944)
@@ -13,6 +13,4 @@
*/
-#include <rpc/types.h>
-#include <rpc/xdr.h>
#include <unistd.h>
#include <string.h>
Index: grass-7.2.2/lib/raster/range.c
===================================================================
--- grass-7.2.2/lib/raster/range.c (revision 71935)
+++ grass-7.2.2/lib/raster/range.c (revision 71944)
@@ -13,5 +13,4 @@
#include <unistd.h>
-#include <rpc/types.h> /* need this for sgi */
#include <grass/raster.h>
Index: grass-7.2.2/lib/raster/R.h
===================================================================
--- grass-7.2.2/lib/raster/R.h (revision 72283)
+++ grass-7.2.2/lib/raster/R.h (revision 72284)
@@ -1,6 +1,5 @@
#include <grass/config.h>
#include <grass/gis.h>
-#include <rpc/types.h>
#ifdef HAVE_GDAL
#include <gdal.h>
#endif

View file

@ -1 +1 @@
SHA512 (grass-7.8.3.tar.gz) = 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84
SHA512 (grass-8.4.2.tar.gz) = bbbe219b0d4a7075374c7f8b11de838f014ea0bce84a22dc9089d65fe49fd4f41d8e39867f08fa12ab46e8ff883389c22ccb9976ef89c2fed24834d1ba5cf6fb