From 3c49d1fb94f66476570aba2957eb6bb409d95f74 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 27 Feb 2022 11:43:36 +0100 Subject: [PATCH 1/5] remove outdated patches --- grass-nourl.patch | 9 ---- grass72_ctypes_gcc7.diff | 90 ---------------------------------------- grass72_rpc_removal.diff | 43 ------------------- 3 files changed, 142 deletions(-) delete mode 100644 grass-nourl.patch delete mode 100644 grass72_ctypes_gcc7.diff delete mode 100644 grass72_rpc_removal.diff diff --git a/grass-nourl.patch b/grass-nourl.patch deleted file mode 100644 index b6908aa..0000000 --- a/grass-nourl.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up grass-7.0.4/gui/icons/grass.desktop.nourl grass-7.0.4/gui/icons/grass.desktop ---- grass-7.0.4/gui/icons/grass.desktop.nourl 2016-01-11 16:03:21.000000000 -0700 -+++ grass-7.0.4/gui/icons/grass.desktop 2016-10-07 12:58:59.279554938 -0600 -@@ -51,5 +51,4 @@ Categories=Education;Science;Geoscience; - Exec=grass70 - Icon=grass70 - Terminal=true --URL=https://grass.osgeo.org/ - Keywords=gis;spatial;geospatial;database;remote sensing;hydrology;vector;raster;visualization;maps;wms;wfs;ogc;osgeo; diff --git a/grass72_ctypes_gcc7.diff b/grass72_ctypes_gcc7.diff deleted file mode 100644 index 6ee91e7..0000000 --- a/grass72_ctypes_gcc7.diff +++ /dev/null @@ -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\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ -- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ -- None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P[FflL]?)(?!\\w))', [ -- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [ -- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P\\#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\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [ -- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [ -- None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P[FflL]?)(?!\\w))', [ -- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [ -- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P(\\#\\#)|(\\#))', [ -- 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\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P\\#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\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P(?P[0-9]+)?(?P[.]?)(?P(?(p1)[0-9]*|[0-9]+))(?P(?:[Ee][+-]?[0-9]+)?)(?P([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P(?P(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?PL?\'(\\\\.|[^\\\\\'])+\')|(?PL?"(\\\\.|[^\\\\"])*")|(?P\\()|(?P\\n)|(?P(\\#\\#)|(\\#))', [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 diff --git a/grass72_rpc_removal.diff b/grass72_rpc_removal.diff deleted file mode 100644 index 48e8762..0000000 --- a/grass72_rpc_removal.diff +++ /dev/null @@ -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 - #include -- --#include /* need this for sgi */ - - #include -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 --#include - #include - #include -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 --#include /* need this for sgi */ - - #include - 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 - #include --#include - #ifdef HAVE_GDAL - #include - #endif From e4056c21c5461ce2f4288fe7b6755acb889b0dda Mon Sep 17 00:00:00 2001 From: Carl George Date: Mon, 25 Sep 2023 18:42:38 -0500 Subject: [PATCH 2/5] Remove non-existent dependencies in EPEL 9 Resolves: rhbz#2240696 --- grass.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grass.spec b/grass.spec index a72e71f..f3a519e 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -111,7 +111,7 @@ Requires: bzip2-libs Requires: libzstd Requires: geos # fedora >= 34: Nothing -%if (0%{?rhel} > 7 || 0%{?fedora} < 34) +%if %{defined el8} Requires: proj-datumgrid Requires: proj-datumgrid-world %endif @@ -368,6 +368,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Sep 25 2023 Carl George - 8.2.1-2 +- Remove non-existent dependencies in EPEL 9, resolves rhbz#2240696 + * Sat Jan 21 2023 Markus Neteler 8.2.1-1 - New upstream version GRASS GIS 8.2.1 From 85cc7605dcf9d98653debd1fc149d05cd145e817 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 24 Jun 2025 09:22:52 -0600 Subject: [PATCH 3/5] Rebuild for proj 9 --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index f3a519e..d15fd47 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -368,6 +368,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Tue Jun 24 2025 Orion Poplawski - 8.2.1-3 +- Rebuild for proj 9 + * Mon Sep 25 2023 Carl George - 8.2.1-2 - Remove non-existent dependencies in EPEL 9, resolves rhbz#2240696 From 933bc8010831c5dc51509e3af2ddca9d31516ef7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 4 Dec 2025 15:21:50 +0100 Subject: [PATCH 4/5] Don't use deprecated %patchN --- grass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index d15fd47..04d85c0 100644 --- a/grass.spec +++ b/grass.spec @@ -180,7 +180,7 @@ GRASS GIS development headers %prep %setup -q -%patch0 -p1 -b.libdir +%patch -P 0 -p1 -b.libdir # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure From 93e613f288988621194afccd80d726c7dcff2f81 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 4 Dec 2025 15:26:06 +0100 Subject: [PATCH 5/5] Rebuild --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 04d85c0..54d513b 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -368,6 +368,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Dec 04 2025 Sandro Mani - 8.2.1-4 +- Rebuild + * Tue Jun 24 2025 Orion Poplawski - 8.2.1-3 - Rebuild for proj 9