From 792f6a075cf09035ca6bf291dd07a98d43de7f41 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 Nov 2021 12:06:56 +0100 Subject: [PATCH 01/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index ec84f53..bee4607 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 7.8.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -366,6 +366,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Nov 11 2021 Sandro Mani - 7.8.6-3 +- Rebuild (gdal) + * Sun Nov 07 2021 Björn Esser - 7.8.6-2 - Add patch to fix installation path in pkgconfig file From e00e7744c5295d444da2966dcfbb6ef447c1f8e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 11:45:04 +0000 Subject: [PATCH 02/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index bee4607..5b20af2 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 7.8.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -366,6 +366,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 7.8.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Nov 11 2021 Sandro Mani - 7.8.6-3 - Rebuild (gdal) From 0ee3c7b64d5a1cd6fdaf1459a350f03c8dc44a80 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Fri, 28 Jan 2022 20:53:55 +0100 Subject: [PATCH 03/62] New upstream version GRASS GIS 8.0.0 --- .gitignore | 1 + grass.spec | 20 ++++++++++---------- sources | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 2d849e2..4bac2db 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /grass-7.8.4.tar.gz /grass-7.8.5.tar.gz /grass-7.8.6.tar.gz +/grass-8.0.0.tar.gz diff --git a/grass.spec b/grass.spec index 5b20af2..f86caa0 100644 --- a/grass.spec +++ b/grass.spec @@ -1,9 +1,9 @@ -%global shortver 78 +%global shortver 80 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 7.8.6 -Release: 4%{?dist} +Version: 8.0.0 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -283,9 +283,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 @@ -366,6 +363,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Fri Jan 28 2022 Markus Neteler - 8.0.0-1 +- New upstream version GRASS GIS 8.0.0 + * Thu Jan 20 2022 Fedora Release Engineering - 7.8.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild @@ -411,16 +411,16 @@ fi * Tue Dec 22 2020 Markus Neteler - 7.8.5-1 - New upstream version GRASS GIS 7.8.5 -* Tue Nov 24 20:59:37 CET 2020 Markus Neteler - 7.8.4-6 +* Tue Nov 24 2020 Markus Neteler - 7.8.4-6 - Clean up proj-datumgrid requires < f34+ -* Fri Nov 20 15:59:37 CET 2020 Sandro Mani - 7.8.4-5 +* Fri Nov 20 2020 Sandro Mani - 7.8.4-5 - Drop proj-datumgrid requires on f34+ -* Fri Nov 6 22:26:41 CET 2020 Sandro Mani - 7.8.4-4 +* Fri Nov 6 2020 Sandro Mani - 7.8.4-4 - Rebuild (proj, gdal) -* Wed Nov 4 18:22:40 CET 2020 Sandro Mani - 7.8.4-3 +* Wed Nov 4 2020 Sandro Mani - 7.8.4-3 - Rebuild (PDAL) * Sat Oct 17 2020 Markus Neteler - 7.8.4-2 diff --git a/sources b/sources index 9d7b11b..999101a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-7.8.6.tar.gz) = 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df +SHA512 (grass-8.0.0.tar.gz) = 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42 From 75d93c82e9aa6cbb6faec0b05bf113b3202d4805 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Thu, 24 Feb 2022 23:24:25 +0100 Subject: [PATCH 04/62] New upstream version GRASS GIS 8.0.1 --- .gitignore | 1 + grass.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4bac2db..32e3b21 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /grass-7.8.5.tar.gz /grass-7.8.6.tar.gz /grass-8.0.0.tar.gz +/grass-8.0.1.tar.gz diff --git a/grass.spec b/grass.spec index f86caa0..bf6e4ec 100644 --- a/grass.spec +++ b/grass.spec @@ -2,7 +2,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.0.0 +Version: 8.0.1 Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System @@ -363,6 +363,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Feb 24 2022 Markus Neteler - 8.0.1-1 +- New upstream version GRASS GIS 8.0.1 + * Fri Jan 28 2022 Markus Neteler - 8.0.0-1 - New upstream version GRASS GIS 8.0.0 diff --git a/sources b/sources index 999101a..f5b7a73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.0.0.tar.gz) = 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42 +SHA512 (grass-8.0.1.tar.gz) = ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f From 0046a622f537015c10f86eb0f45494ac697d6558 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 10 Mar 2022 13:42:04 +0100 Subject: [PATCH 05/62] Rebuild for proj-9.0.0 --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index bf6e4ec..98888aa 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -363,6 +363,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Mar 10 2022 Sandro Mani - 8.0.1-2 +- Rebuild for proj-9.0.0 + * Thu Feb 24 2022 Markus Neteler - 8.0.1-1 - New upstream version GRASS GIS 8.0.1 From f10ae78e04d8efa7176b94ba1a64654d3a6f0ee4 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Tue, 29 Mar 2022 19:11:21 +0200 Subject: [PATCH 06/62] Rebuild for pdal-2.4.0 --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 98888aa..8d04001 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -363,6 +363,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Tue Mar 29 2022 Markus Neteler - 8.0.1-3 +- Rebuild for pdal-2.4.0 + * Thu Mar 10 2022 Sandro Mani - 8.0.1-2 - Rebuild for proj-9.0.0 From bb06a8fa68d845f99bc347efd8660e1e9e8699dd Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Thu, 12 May 2022 17:50:29 +0200 Subject: [PATCH 07/62] New upstream version GRASS GIS 8.0.2 --- .gitignore | 1 + grass-pkgconfig.patch | 10 +++++----- grass.spec | 8 ++++++-- sources | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 32e3b21..50d8032 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /grass-7.8.6.tar.gz /grass-8.0.0.tar.gz /grass-8.0.1.tar.gz +/grass-8.0.2.tar.gz diff --git a/grass-pkgconfig.patch b/grass-pkgconfig.patch index 9afaf06..e713aee 100644 --- a/grass-pkgconfig.patch +++ b/grass-pkgconfig.patch @@ -1,10 +1,10 @@ -Index: grass-7.8.6/grass.pc.in -=================================================================== ---- grass-7.8.6.orig/grass.pc.in -+++ grass-7.8.6/grass.pc.in +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@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@ --config + # 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@ diff --git a/grass.spec b/grass.spec index 8d04001..9d8a162 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.0.1 -Release: 3%{?dist} +Version: 8.0.2 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -193,6 +193,7 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},' CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's/ -Werror=format-security//')" CXXFLAGS="-std=c++98 ${CFLAGS}" %configure \ + --prefix=%{_libdir} \ --with-cxx \ --with-tiff \ --with-png \ @@ -363,6 +364,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu May 12 2022 Markus Neteler - 8.0.2-1 +- New upstream version GRASS GIS 8.0.2 + * Tue Mar 29 2022 Markus Neteler - 8.0.1-3 - Rebuild for pdal-2.4.0 diff --git a/sources b/sources index f5b7a73..eb775d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.0.1.tar.gz) = ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f +SHA512 (grass-8.0.2.tar.gz) = fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c From a64639171db4a5b583b46fff5124e57b32584dbb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 May 2022 17:59:34 +0200 Subject: [PATCH 08/62] Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 9d8a162..38876d9 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -364,6 +364,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat May 21 2022 Sandro Mani - 8.0.2-2 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + * Thu May 12 2022 Markus Neteler - 8.0.2-1 - New upstream version GRASS GIS 8.0.2 From 813a632f9804c9de63c106ba95abdea3a3030f5e Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 4 Jun 2022 12:07:12 +0200 Subject: [PATCH 09/62] New upstream version GRASS GIS 8.2.0 --- .gitignore | 1 + grass.spec | 11 +++-- grass72_ctypes_gcc7.diff | 90 ---------------------------------------- grass72_rpc_removal.diff | 43 ------------------- sources | 2 +- 5 files changed, 9 insertions(+), 138 deletions(-) delete mode 100644 grass72_ctypes_gcc7.diff delete mode 100644 grass72_rpc_removal.diff diff --git a/.gitignore b/.gitignore index 50d8032..69e1c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /grass-8.0.0.tar.gz /grass-8.0.1.tar.gz /grass-8.0.2.tar.gz +/grass-8.2.0.tar.gz diff --git a/grass.spec b/grass.spec index 38876d9..6f99882 100644 --- a/grass.spec +++ b/grass.spec @@ -1,9 +1,9 @@ -%global shortver 80 +%global shortver 82 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.0.2 -Release: 2%{?dist} +Version: 8.2.0 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -357,13 +357,16 @@ 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 +* Sat Jun 04 2022 Markus Neteler - 8.2.0-1 +- New upstream version GRASS GIS 8.2.0 + * Sat May 21 2022 Sandro Mani - 8.0.2-2 - Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 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 diff --git a/sources b/sources index eb775d6..002c513 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.0.2.tar.gz) = fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c +SHA512 (grass-8.2.0.tar.gz) = 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930 From bdb2ea2ec925e3a1bd25f778bd71b3fcec9059c6 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Mon, 11 Jul 2022 12:04:12 +0200 Subject: [PATCH 10/62] .package_note hack (RHBZ #2084342 + RHBZ #2102895) --- grass.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 6f99882..09f8ecc 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -240,6 +240,9 @@ CXXFLAGS="-std=c++98 ${CFLAGS}" --with-zstd \ --with-proj-share=%{_datadir}/proj +# .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} # by default, grass will be installed to /usr/grass-%%{version} @@ -364,6 +367,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Jul 11 2022 Markus Neteler - 8.2.0-2 +- .package_note hack for RHBZ #2084342 and RHBZ #2102895 + * Sat Jun 04 2022 Markus Neteler - 8.2.0-1 - New upstream version GRASS GIS 8.2.0 From eba7ceca74d19bb574cba71f651b5ba69218ad53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 12:59:50 +0000 Subject: [PATCH 11/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 09f8ecc..fe41cd2 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -367,6 +367,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 8.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 11 2022 Markus Neteler - 8.2.0-2 - .package_note hack for RHBZ #2084342 and RHBZ #2102895 From a6030f684e77a38c8eebab9e28f4a9be4203ffb5 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Mon, 8 Aug 2022 15:38:58 +0200 Subject: [PATCH 12/62] Rebuild for RHBZ #2107826 (PYC magic number has changed) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index fe41cd2..f8dcb26 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -367,6 +367,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Aug 08 2022 Markus Neteler - 8.2.0-4 +- Rebuild for RHBZ #2107826 (PYC magic number has changed) + * Thu Jul 21 2022 Fedora Release Engineering - 8.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bd14b8e23f477d5b363982bae5919c77b5dc0cbd Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 17 Sep 2022 18:37:59 +0200 Subject: [PATCH 13/62] Fix unexpected keyword argument 'codeset' (Python 3.11) for RHBZ #2126608 --- gettext_codeset.patch | 16 ++++++++++++++++ grass.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gettext_codeset.patch diff --git a/gettext_codeset.patch b/gettext_codeset.patch new file mode 100644 index 0000000..bb4e14d --- /dev/null +++ b/gettext_codeset.patch @@ -0,0 +1,16 @@ +diff --git a/lib/init/grass.py b/lib/init/grass.py +index 3914c458df..8d55916e19 100755 +--- a/lib/init/grass.py ++++ b/lib/init/grass.py +@@ -1560,10 +1560,7 @@ def set_language(grass_config_dir): + del os.environ["LC_ALL"] # Remove LC_ALL to not override LC_NUMERIC + + # From now on enforce the new language +- if encoding: +- gettext.install("grasslibs", gpath("locale"), codeset=encoding) +- else: +- gettext.install("grasslibs", gpath("locale")) ++ gettext.install("grasslibs", gpath("locale")) + + + def lock_mapset(mapset_path, force_gislock_removal, user): diff --git a/grass.spec b/grass.spec index f8dcb26..9365717 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -26,6 +26,7 @@ Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.ta # fix pkgconfig file Patch0: grass-pkgconfig.patch +Patch1: gettext_codeset.patch BuildRequires: bison %if %{with flexiblas} @@ -177,6 +178,7 @@ GRASS GIS development headers %prep %setup -q %patch0 -p1 -b.libdir +%patch1 -p1 # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure @@ -367,6 +369,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Sep 17 2022 Markus Neteler - 8.2.0-5 +- fix unexpected keyword argument 'codeset' (Python 3.11) for RHBZ #2126608 + * Mon Aug 08 2022 Markus Neteler - 8.2.0-4 - Rebuild for RHBZ #2107826 (PYC magic number has changed) From 65f12df9df7515907a074ea20e2c240369296fcb Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Thu, 3 Nov 2022 17:06:44 +0100 Subject: [PATCH 14/62] fix RPM ARCH not defined for GRASS GIS addon installation (RHBZ #2138373) --- grass.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 9365717..a62b93b 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -20,6 +20,10 @@ Summary: GRASS GIS - Geographic Resources Analysis Support System # "%%bcond_without" means "ENABLE by default and create a --without option" %bcond_without python3 +# GRASS GIS addon reuses the compiler flags originating from rpmbuild environment, +# hence disabling package-notes plugin +%undefine _package_note_file + License: GPLv2+ URL: https://grass.osgeo.org Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz @@ -369,6 +373,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Nov 03 2022 Markus Neteler - 8.2.0-6 +- fix RPM ARCH not defined for GRASS GIS addon installation (RHBZ #2138373) + * Sat Sep 17 2022 Markus Neteler - 8.2.0-5 - fix unexpected keyword argument 'codeset' (Python 3.11) for RHBZ #2126608 From 7a346860d1bde4855a3a35c1d0cea7d50d0996a7 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Wed, 9 Nov 2022 15:45:58 +0100 Subject: [PATCH 15/62] SPDX license tag update --- grass.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grass.spec b/grass.spec index a62b93b..c96a6a3 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -24,7 +24,7 @@ Summary: GRASS GIS - Geographic Resources Analysis Support System # hence disabling package-notes plugin %undefine _package_note_file -License: GPLv2+ +License: GPL-2.0-or-later URL: https://grass.osgeo.org Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz @@ -373,6 +373,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Wed Nov 09 2022 Markus Neteler 8.2.0-7 +- SPDX license tag update + * Thu Nov 03 2022 Markus Neteler - 8.2.0-6 - fix RPM ARCH not defined for GRASS GIS addon installation (RHBZ #2138373) From 30ebcb4abefc761262443bd0349374f4f34ca940 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 12 Nov 2022 18:59:25 +0100 Subject: [PATCH 16/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index c96a6a3..b0a1cfe 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -373,6 +373,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Nov 12 2022 Sandro Mani - 8.2.0-8 +- Rebuild (gdal) + * Wed Nov 09 2022 Markus Neteler 8.2.0-7 - SPDX license tag update From 2d754e9a74cb904c7629ab378acf093b88436a89 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 14 Jan 2023 20:26:38 +0100 Subject: [PATCH 17/62] Rebuild (PDAL) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index b0a1cfe..3c57a86 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -373,6 +373,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Jan 14 2023 Sandro Mani - 8.2.0-9 +- Rebuild (PDAL) + * Sat Nov 12 2022 Sandro Mani - 8.2.0-8 - Rebuild (gdal) From d67267163405ca1ce0cafc8bce24f62946e1f2de Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 14 Jan 2023 21:18:44 +0100 Subject: [PATCH 18/62] Fix PDAL detection --- grass-pdal.patch | 24 ++++++++++++++++++++++++ grass.spec | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 grass-pdal.patch diff --git a/grass-pdal.patch b/grass-pdal.patch new file mode 100644 index 0000000..e1f7333 --- /dev/null +++ b/grass-pdal.patch @@ -0,0 +1,24 @@ +diff -rupN grass-8.2.0/configure grass-8.2.0-new/configure +--- grass-8.2.0/configure 2022-06-03 15:27:06.000000000 +0200 ++++ grass-8.2.0-new/configure 2023-01-14 21:17:19.820567081 +0100 +@@ -9040,7 +9040,7 @@ fi + ac_save_cppflags="$CPPFLAGS" + LIBS="$LIBS $PDAL_LIBS" + CFLAGS="$CFLAGS $PDAL_CFLAGS" +- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" ++ CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC -std=c++14" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +diff -rupN grass-8.2.0/configure.ac grass-8.2.0-new/configure.ac +--- grass-8.2.0/configure.ac 2022-06-03 15:27:06.000000000 +0200 ++++ grass-8.2.0-new/configure.ac 2023-01-14 21:17:34.996263333 +0100 +@@ -1009,7 +1009,7 @@ else + ac_save_cppflags="$CPPFLAGS" + LIBS="$LIBS $PDAL_LIBS" + CFLAGS="$CFLAGS $PDAL_CFLAGS" +- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" ++ CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC -std=c++14" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include + #include + class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[ diff --git a/grass.spec b/grass.spec index 3c57a86..aefd774 100644 --- a/grass.spec +++ b/grass.spec @@ -31,6 +31,8 @@ Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.ta # fix pkgconfig file Patch0: grass-pkgconfig.patch Patch1: gettext_codeset.patch +# Fix PDAL detection +Patch2: grass-pdal.patch BuildRequires: bison %if %{with flexiblas} @@ -183,6 +185,7 @@ GRASS GIS development headers %setup -q %patch0 -p1 -b.libdir %patch1 -p1 +%patch2 -p1 # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure From e9fa538502b6ebb96388d5401e941afcf54e2703 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 14 Jan 2023 22:21:29 +0100 Subject: [PATCH 19/62] Update grass-pdal.patch --- grass-pdal.patch | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/grass-pdal.patch b/grass-pdal.patch index e1f7333..813c5dc 100644 --- a/grass-pdal.patch +++ b/grass-pdal.patch @@ -1,24 +1,24 @@ diff -rupN grass-8.2.0/configure grass-8.2.0-new/configure ---- grass-8.2.0/configure 2022-06-03 15:27:06.000000000 +0200 -+++ grass-8.2.0-new/configure 2023-01-14 21:17:19.820567081 +0100 -@@ -9040,7 +9040,7 @@ fi - ac_save_cppflags="$CPPFLAGS" - LIBS="$LIBS $PDAL_LIBS" - CFLAGS="$CFLAGS $PDAL_CFLAGS" -- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" -+ CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC -std=c++14" - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +--- grass-8.2.0/configure 2023-01-14 22:04:03.207559870 +0100 ++++ grass-8.2.0-new/configure 2023-01-14 22:07:17.245990464 +0100 +@@ -9029,7 +9029,7 @@ fi + + if test "$PDAL_CONFIG" != "" ; then + PDAL_LIBS=`"$PDAL_CONFIG" --libs` +- PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` ++ PDAL_CPPFLAGS="`"$PDAL_CONFIG" --cxxflags` -std=c++14" + PDAL_INC=`"$PDAL_CONFIG" --includes` + USE_PDAL=1 + fi diff -rupN grass-8.2.0/configure.ac grass-8.2.0-new/configure.ac ---- grass-8.2.0/configure.ac 2022-06-03 15:27:06.000000000 +0200 -+++ grass-8.2.0-new/configure.ac 2023-01-14 21:17:34.996263333 +0100 -@@ -1009,7 +1009,7 @@ else - ac_save_cppflags="$CPPFLAGS" - LIBS="$LIBS $PDAL_LIBS" - CFLAGS="$CFLAGS $PDAL_CFLAGS" -- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" -+ CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC -std=c++14" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - #include - class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[ +--- grass-8.2.0/configure.ac 2023-01-14 22:04:03.209559941 +0100 ++++ grass-8.2.0-new/configure.ac 2023-01-14 22:07:13.774140192 +0100 +@@ -998,7 +998,7 @@ else + + if test "$PDAL_CONFIG" != "" ; then + PDAL_LIBS=`"$PDAL_CONFIG" --libs` +- PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` ++ PDAL_CPPFLAGS="`"$PDAL_CONFIG" --cxxflags` -std=c++14" + PDAL_INC=`"$PDAL_CONFIG" --includes` + USE_PDAL=1 + fi From 98450685e28bd0bbb9d721335bb7d400c8079f6c Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Mon, 16 Jan 2023 21:15:47 +0100 Subject: [PATCH 20/62] replace grass-pdal.patch Use fix: https://github.com/OSGeo/grass/pull/2749 --- grass-pdal.patch | 52 ++++++++++++++++++++++++++++++++++++++++-------- grass.spec | 5 ++++- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/grass-pdal.patch b/grass-pdal.patch index 813c5dc..f130cd4 100644 --- a/grass-pdal.patch +++ b/grass-pdal.patch @@ -1,24 +1,60 @@ diff -rupN grass-8.2.0/configure grass-8.2.0-new/configure ---- grass-8.2.0/configure 2023-01-14 22:04:03.207559870 +0100 -+++ grass-8.2.0-new/configure 2023-01-14 22:07:17.245990464 +0100 -@@ -9029,7 +9029,7 @@ fi +--- grass-8.2.0/configure 2023-01-16 20:04:03.407559870 +0100 ++++ grass-8.2.0-new/configure 2023-01-16 20:07:17.445990464 +0100 +@@ -9029,7 +9029,6 @@ fi if test "$PDAL_CONFIG" != "" ; then PDAL_LIBS=`"$PDAL_CONFIG" --libs` - PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` -+ PDAL_CPPFLAGS="`"$PDAL_CONFIG" --cxxflags` -std=c++14" PDAL_INC=`"$PDAL_CONFIG" --includes` USE_PDAL=1 fi +@@ -9037,10 +9036,8 @@ fi + PDAL= + ac_save_libs="$LIBS" + ac_save_cflags="$CFLAGS" +- ac_save_cppflags="$CPPFLAGS" + LIBS="$LIBS $PDAL_LIBS" + CFLAGS="$CFLAGS $PDAL_CFLAGS" +- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -9332,7 +9329,6 @@ rm -f core conftest.err conftest.$ac_obj + conftest$ac_exeext conftest.$ac_ext + LIBS=${ac_save_libs} + CFLAGS=${ac_save_cflags} +- CPPFLAGS=${ac_save_cppflags} + + + $as_echo "#define HAVE_PDAL 1" >>confdefs.h diff -rupN grass-8.2.0/configure.ac grass-8.2.0-new/configure.ac ---- grass-8.2.0/configure.ac 2023-01-14 22:04:03.209559941 +0100 -+++ grass-8.2.0-new/configure.ac 2023-01-14 22:07:13.774140192 +0100 -@@ -998,7 +998,7 @@ else +--- grass-8.2.0/configure.ac 2023-01-16 20:04:03.407559870 +0100 ++++ grass-8.2.0-new/configure.ac 2023-01-16 20:07:17.445990464 +0100 +@@ -998,7 +998,6 @@ else if test "$PDAL_CONFIG" != "" ; then PDAL_LIBS=`"$PDAL_CONFIG" --libs` - PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` -+ PDAL_CPPFLAGS="`"$PDAL_CONFIG" --cxxflags` -std=c++14" PDAL_INC=`"$PDAL_CONFIG" --includes` USE_PDAL=1 fi +@@ -1006,10 +1005,8 @@ else + PDAL= + ac_save_libs="$LIBS" + ac_save_cflags="$CFLAGS" +- ac_save_cppflags="$CPPFLAGS" + LIBS="$LIBS $PDAL_LIBS" + CFLAGS="$CFLAGS $PDAL_CFLAGS" +- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include + #include + class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[ +@@ -1021,7 +1018,6 @@ else + ]) + LIBS=${ac_save_libs} + CFLAGS=${ac_save_cflags} +- CPPFLAGS=${ac_save_cppflags} + + AC_DEFINE(HAVE_PDAL, 1, [define if PDAL exists]) + fi diff --git a/grass.spec b/grass.spec index aefd774..533a051 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -376,6 +376,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Jan 16 2023 Markus Neteler 8.2.0-10 +- modify grass-pdal.patch for alternative C++ fix + * Sat Jan 14 2023 Sandro Mani - 8.2.0-9 - Rebuild (PDAL) From 0faccf720f996bc237a0045e0c67c95b799c1477 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 19 Jan 2023 09:03:54 +0100 Subject: [PATCH 21/62] Drop CFLAGS/CXXFLAGS override --- grass.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/grass.spec b/grass.spec index 533a051..3673842 100644 --- a/grass.spec +++ b/grass.spec @@ -198,9 +198,6 @@ sed -i -e 's/-lblas/-lflexiblas/g' -e 's/-llapack/-lflexiblas/g' configure 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-cxx \ From 7b2f1a4d4fb5abf785b065a8ea8eb984a1017355 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 11:29:38 +0000 Subject: [PATCH 22/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 3673842..6dc168d 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -373,6 +373,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 8.2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Markus Neteler 8.2.0-10 - modify grass-pdal.patch for alternative C++ fix From 513c0a75439af1166dadf418a5f668755a3d8013 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 21 Jan 2023 21:25:50 +0100 Subject: [PATCH 23/62] New upstream version GRASS GIS 8.2.1 --- .gitignore | 1 + gettext_codeset.patch | 16 ------------ grass-pdal.patch | 60 ------------------------------------------- grass.spec | 12 ++++----- sources | 2 +- 5 files changed, 7 insertions(+), 84 deletions(-) delete mode 100644 gettext_codeset.patch delete mode 100644 grass-pdal.patch diff --git a/.gitignore b/.gitignore index 69e1c1f..e42cb89 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /grass-8.0.1.tar.gz /grass-8.0.2.tar.gz /grass-8.2.0.tar.gz +/grass-8.2.1.tar.gz diff --git a/gettext_codeset.patch b/gettext_codeset.patch deleted file mode 100644 index bb4e14d..0000000 --- a/gettext_codeset.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/init/grass.py b/lib/init/grass.py -index 3914c458df..8d55916e19 100755 ---- a/lib/init/grass.py -+++ b/lib/init/grass.py -@@ -1560,10 +1560,7 @@ def set_language(grass_config_dir): - del os.environ["LC_ALL"] # Remove LC_ALL to not override LC_NUMERIC - - # From now on enforce the new language -- if encoding: -- gettext.install("grasslibs", gpath("locale"), codeset=encoding) -- else: -- gettext.install("grasslibs", gpath("locale")) -+ gettext.install("grasslibs", gpath("locale")) - - - def lock_mapset(mapset_path, force_gislock_removal, user): diff --git a/grass-pdal.patch b/grass-pdal.patch deleted file mode 100644 index f130cd4..0000000 --- a/grass-pdal.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -rupN grass-8.2.0/configure grass-8.2.0-new/configure ---- grass-8.2.0/configure 2023-01-16 20:04:03.407559870 +0100 -+++ grass-8.2.0-new/configure 2023-01-16 20:07:17.445990464 +0100 -@@ -9029,7 +9029,6 @@ fi - - if test "$PDAL_CONFIG" != "" ; then - PDAL_LIBS=`"$PDAL_CONFIG" --libs` -- PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` - PDAL_INC=`"$PDAL_CONFIG" --includes` - USE_PDAL=1 - fi -@@ -9037,10 +9036,8 @@ fi - PDAL= - ac_save_libs="$LIBS" - ac_save_cflags="$CFLAGS" -- ac_save_cppflags="$CPPFLAGS" - LIBS="$LIBS $PDAL_LIBS" - CFLAGS="$CFLAGS $PDAL_CFLAGS" -- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -9332,7 +9329,6 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=${ac_save_libs} - CFLAGS=${ac_save_cflags} -- CPPFLAGS=${ac_save_cppflags} - - - $as_echo "#define HAVE_PDAL 1" >>confdefs.h -diff -rupN grass-8.2.0/configure.ac grass-8.2.0-new/configure.ac ---- grass-8.2.0/configure.ac 2023-01-16 20:04:03.407559870 +0100 -+++ grass-8.2.0-new/configure.ac 2023-01-16 20:07:17.445990464 +0100 -@@ -998,7 +998,6 @@ else - - if test "$PDAL_CONFIG" != "" ; then - PDAL_LIBS=`"$PDAL_CONFIG" --libs` -- PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags` - PDAL_INC=`"$PDAL_CONFIG" --includes` - USE_PDAL=1 - fi -@@ -1006,10 +1005,8 @@ else - PDAL= - ac_save_libs="$LIBS" - ac_save_cflags="$CFLAGS" -- ac_save_cppflags="$CPPFLAGS" - LIBS="$LIBS $PDAL_LIBS" - CFLAGS="$CFLAGS $PDAL_CFLAGS" -- CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - #include - class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[ -@@ -1021,7 +1018,6 @@ else - ]) - LIBS=${ac_save_libs} - CFLAGS=${ac_save_cflags} -- CPPFLAGS=${ac_save_cppflags} - - AC_DEFINE(HAVE_PDAL, 1, [define if PDAL exists]) - fi diff --git a/grass.spec b/grass.spec index 6dc168d..a72e71f 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.2.0 -Release: 11%{?dist} +Version: 8.2.1 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -30,9 +30,6 @@ Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.ta # fix pkgconfig file Patch0: grass-pkgconfig.patch -Patch1: gettext_codeset.patch -# Fix PDAL detection -Patch2: grass-pdal.patch BuildRequires: bison %if %{with flexiblas} @@ -184,8 +181,6 @@ GRASS GIS development headers %prep %setup -q %patch0 -p1 -b.libdir -%patch1 -p1 -%patch2 -p1 # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure @@ -373,6 +368,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Jan 21 2023 Markus Neteler 8.2.1-1 +- New upstream version GRASS GIS 8.2.1 + * Thu Jan 19 2023 Fedora Release Engineering - 8.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 002c513..9209cdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.2.0.tar.gz) = 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930 +SHA512 (grass-8.2.1.tar.gz) = 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661 From a4e4073d0d068a2f6006ff26a3fbd9f8c06a2087 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 May 2023 14:39:02 +0200 Subject: [PATCH 24/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index a72e71f..3c57fad 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 @@ -368,6 +368,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu May 11 2023 Sandro Mani - 8.2.1-2 +- Rebuild (gdal) + * Sat Jan 21 2023 Markus Neteler 8.2.1-1 - New upstream version GRASS GIS 8.2.1 From 7a7ffd7e35afdaa4820284957b40c9d7be255eaa Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 25 Jun 2023 17:44:51 +0200 Subject: [PATCH 25/62] New upstream version GRASS GIS 8.3.0 (RHBZ # 2217231) --- .gitignore | 1 + grass.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e42cb89..89fbfb8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /grass-8.0.2.tar.gz /grass-8.2.0.tar.gz /grass-8.2.1.tar.gz +/grass-8.3.0.tar.gz diff --git a/grass.spec b/grass.spec index 3c57fad..1009d89 100644 --- a/grass.spec +++ b/grass.spec @@ -1,9 +1,9 @@ -%global shortver 82 +%global shortver 83 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.2.1 -Release: 2%{?dist} +Version: 8.3.0 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -29,7 +29,7 @@ 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 BuildRequires: bison %if %{with flexiblas} @@ -180,7 +180,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 @@ -352,7 +352,6 @@ fi %license AUTHORS COPYING GPL.TXT CHANGES %{_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 +367,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Jun 25 2023 Markus Neteler 8.3.0-1 +- New upstream version GRASS GIS 8.3.0 + * Thu May 11 2023 Sandro Mani - 8.2.1-2 - Rebuild (gdal) diff --git a/sources b/sources index 9209cdb..cf3f408 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.2.1.tar.gz) = 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661 +SHA512 (grass-8.3.0.tar.gz) = 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15 From 8381e3510bb0f335503c13b5c065c63a44426106 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 05:32:07 +0000 Subject: [PATCH 26/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 1009d89..d3529d5 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -367,6 +367,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 8.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jun 25 2023 Markus Neteler 8.3.0-1 - New upstream version GRASS GIS 8.3.0 From d7481826c150b22459420d1b1850e829928ca282 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Sun, 6 Aug 2023 19:05:09 +0200 Subject: [PATCH 27/62] remove support for RHEL6 --- grass.spec | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/grass.spec b/grass.spec index d3529d5..a684531 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -42,16 +42,12 @@ BuildRequires: gcc-c++ BuildRequires: desktop-file-utils BuildRequires: fftw-devel BuildRequires: flex -%if (0%{?rhel} > 6 || 0%{?fedora}) BuildRequires: freetype-devel -%endif 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 @@ -62,9 +58,7 @@ 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 @@ -72,16 +66,12 @@ 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: proj-devel -%if (0%{?rhel} <= 6 && !0%{?fedora}) -# argparse is included in python2.7+ but not python2.6 -BuildRequires: python-argparse -%endif %if 0%{?rhel} == 7 # EPEL7 BuildRequires: python%{python3_version_nodots}-dateutil @@ -89,12 +79,7 @@ BuildRequires: python%{python3_version_nodots}-dateutil BuildRequires: python3-dateutil %endif BuildRequires: python3-devel -%if (0%{?rhel} > 6 || 0%{?fedora}) BuildRequires: python3-pillow -%else -# EPEL6 -BuildRequires: python-imaging -%endif BuildRequires: PDAL BuildRequires: PDAL-libs BuildRequires: PDAL-devel @@ -122,23 +107,13 @@ 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 -%else Requires: python3-wxpython4 -%endif Requires: PDAL Requires: PDAL-libs @@ -214,9 +189,7 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},' --with-lapack-includes=%{_includedir}/flexiblas \ %endif --with-cairo \ -%if (0%{?rhel} > 6 || 0%{?fedora}) --with-freetype \ -%endif --with-nls \ --with-pdal \ --with-readline \ @@ -225,9 +198,7 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},' --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) --with-mysql-libs=%{_libdir} \ @@ -316,7 +287,7 @@ cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf</dev/null || : @@ -367,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Aug 06 2023 Alexandre Detiste - 8.3.0-3 +- Remove support for RHEL6: Grass is now Python3 only + * Thu Jul 20 2023 Fedora Release Engineering - 8.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 8860870ecca3e2bce41330af6a64d7bc07b5c2a5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 15 Oct 2023 00:20:17 +0200 Subject: [PATCH 28/62] Rebuild (PDAL) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index a684531..5f80c8c 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Oct 14 2023 Sandro Mani - 8.3.0-4 +- Rebuild (PDAL) + * Sun Aug 06 2023 Alexandre Detiste - 8.3.0-3 - Remove support for RHEL6: Grass is now Python3 only From 5d238445c3da04e101def9d2fdec09499978801f Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Thu, 26 Oct 2023 14:26:20 +0200 Subject: [PATCH 29/62] Update to 8.3.1 (#2246359) --- .gitignore | 2 ++ grass.spec | 7 +++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 89fbfb8..3a3360b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /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 diff --git a/grass.spec b/grass.spec index 5f80c8c..ff8602b 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.3.0 -Release: 4%{?dist} +Version: 8.3.1 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Oct 26 2023 Fedora Release Monitoring - 8.3.1-1 +- Update to 8.3.1 (#2246359) + * Sat Oct 14 2023 Sandro Mani - 8.3.0-4 - Rebuild (PDAL) diff --git a/sources b/sources index cf3f408..b848fb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.3.0.tar.gz) = 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15 +SHA512 (grass-8.3.1.tar.gz) = 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793 From 4d5fa75ad62a82578cd73cbf26de12cd56043517 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 28 Oct 2023 19:34:41 +0200 Subject: [PATCH 30/62] fix obsolete configure parameters --- grass.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/grass.spec b/grass.spec index ff8602b..bf3c13c 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -172,7 +172,6 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},' --prefix=%{_libdir} \ --with-cxx \ --with-tiff \ - --with-png \ --with-postgres \ %if 0%{?rhel} > 7 --with-mysql=no \ @@ -196,7 +195,6 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},' --with-regex \ --with-openmp \ --with-gdal=%{_bindir}/gdal-config \ - --with-wxwidgets=%{_bindir}/wx-config \ --with-geos=%{_bindir}/geos-config \ --with-netcdf=%{_bindir}/nc-config \ --with-mysql-includes=%{_includedir}/mysql \ @@ -338,8 +336,11 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Oct 28 2023 Markus Neteler 8.3.1-2 +- fix obsolete configure parameters + * Thu Oct 26 2023 Fedora Release Monitoring - 8.3.1-1 -- Update to 8.3.1 (#2246359) +- Update to GRASS GIS 8.3.1 (#2246359) * Sat Oct 14 2023 Sandro Mani - 8.3.0-4 - Rebuild (PDAL) From 479fe227552c0e2759e7196b552f922ebdf37fb8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Nov 2023 18:29:31 +0100 Subject: [PATCH 31/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index bf3c13c..63c15a5 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -336,6 +336,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Wed Nov 15 2023 Sandro Mani - 8.3.1-3 +- Rebuild (gdal) + * Sat Oct 28 2023 Markus Neteler 8.3.1-2 - fix obsolete configure parameters From 51551285c8fbf3578a9d98d479c62509a2ef22ff Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 3 Jan 2024 20:19:02 +0100 Subject: [PATCH 32/62] Fix C compatibility issue in MySQL port handling Related to: --- grass-c99.patch | 23 +++++++++++++++++++++++ grass.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 grass-c99.patch diff --git a/grass-c99.patch b/grass-c99.patch new file mode 100644 index 0000000..d708518 --- /dev/null +++ b/grass-c99.patch @@ -0,0 +1,23 @@ +Use integer port argument with mysql_real_connect + +The port argument is not a string, but a plain integer. In the past, +compilers ignore such type errors and produced a warning only, but +this is changing, so this change also addresses a potential build +failure. + +Submitted upstream: + +diff -ur grass-8.3.1.orig/db/drivers/mysql/db.c grass-8.3.1/db/drivers/mysql/db.c +--- grass-8.3.1.orig/db/drivers/mysql/db.c 2023-10-24 21:27:44.000000000 +0200 ++++ grass-8.3.1/db/drivers/mysql/db.c 2024-01-03 16:54:24.939317306 +0100 +@@ -54,7 +54,9 @@ + + connection = mysql_init(NULL); + res = mysql_real_connect(connection, host, user, password, +- connpar.dbname, port, NULL, 0); ++ connpar.dbname, ++ port != NULL ? atoi(port) : 0, ++ NULL, 0); + + if (res == NULL) { + db_d_append_error("%s\n%s", _("Connection failed."), diff --git a/grass.spec b/grass.spec index 63c15a5..572dcb7 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -30,6 +30,7 @@ Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.ta # fix pkgconfig file Patch 0: grass-pkgconfig.patch +Patch1: grass-c99.patch BuildRequires: bison %if %{with flexiblas} @@ -156,6 +157,7 @@ GRASS GIS development headers %prep %setup -q %patch 0 -p1 -b.libdir +%patch -P 1 -p1 # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure @@ -336,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Wed Jan 3 2024 Florian Weimer - 8.3.1-4 +- Fix C compatibility issue in MySQL port handling + * Wed Nov 15 2023 Sandro Mani - 8.3.1-3 - Rebuild (gdal) From e840ecbbeb6b7b1de81c79b6d1ca3f522e7072e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 21:28:27 +0000 Subject: [PATCH 33/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 572dcb7..16ff5f4 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 8.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 3 2024 Florian Weimer - 8.3.1-4 - Fix C compatibility issue in MySQL port handling From 0e710f0d0ae3d8a30c0f3a0f04c881a546de581d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 20:59:29 +0000 Subject: [PATCH 34/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 16ff5f4..ffdfcbf 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 8.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 8.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ba342d78b36dae9955e6318ffaa80d5576532447 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Fri, 8 Mar 2024 10:32:14 +0100 Subject: [PATCH 35/62] Update to GRASS GIS 8.3.2 (#2268514) --- .gitignore | 1 + grass.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3a3360b..067d726 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /grass-8.3.0.tar.gz /grass-.tar.gz /grass-8.3.1.tar.gz +/grass-8.3.2.tar.gz diff --git a/grass.spec b/grass.spec index ffdfcbf..765bb93 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.3.1 -Release: 6%{?dist} +Version: 8.3.2 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Mar 07 2024 Markus Neteler - 8.3.2-1 +- Update to 8.3.2 (#2268514) + * Wed Jan 24 2024 Fedora Release Engineering - 8.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index b848fb9..20a96a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.3.1.tar.gz) = 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793 +SHA512 (grass-8.3.2.tar.gz) = 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0 From 9b08658ff6dcecf70efdcecc411ba37da8088e42 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 19 Mar 2024 11:51:21 +0100 Subject: [PATCH 36/62] Rebuild (grass) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 765bb93..13d959f 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Tue Mar 19 2024 Sandro Mani - 8.3.2-2 +- Rebuild (PDAL) + * Thu Mar 07 2024 Markus Neteler - 8.3.2-1 - Update to 8.3.2 (#2268514) From 9860162dd4c3e6fd02fdd062ae731d3863bff648 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 14 May 2024 15:32:22 +0200 Subject: [PATCH 37/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 13d959f..70f8360 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Tue May 14 2024 Sandro Mani - 8.3.2-3 +- Rebuild (gdal) + * Tue Mar 19 2024 Sandro Mani - 8.3.2-2 - Rebuild (PDAL) From 5ec0f30c8bbbdfecbe7a1146686874250696b805 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 08:33:19 +0000 Subject: [PATCH 38/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 70f8360..4e9b303 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -338,6 +338,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 8.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 14 2024 Sandro Mani - 8.3.2-3 - Rebuild (gdal) From 855271be24f131a353c4076ffa8aad2861b35cd5 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 28 Jul 2024 21:14:07 +0200 Subject: [PATCH 39/62] Update to GRASS GIS 8.4.0 --- .gitignore | 1 + grass-c99.patch | 23 ----------------------- grass.spec | 11 ++++++----- sources | 2 +- 4 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 grass-c99.patch diff --git a/.gitignore b/.gitignore index 067d726..11b6f71 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /grass-.tar.gz /grass-8.3.1.tar.gz /grass-8.3.2.tar.gz +/grass-8.4.0.tar.gz diff --git a/grass-c99.patch b/grass-c99.patch deleted file mode 100644 index d708518..0000000 --- a/grass-c99.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use integer port argument with mysql_real_connect - -The port argument is not a string, but a plain integer. In the past, -compilers ignore such type errors and produced a warning only, but -this is changing, so this change also addresses a potential build -failure. - -Submitted upstream: - -diff -ur grass-8.3.1.orig/db/drivers/mysql/db.c grass-8.3.1/db/drivers/mysql/db.c ---- grass-8.3.1.orig/db/drivers/mysql/db.c 2023-10-24 21:27:44.000000000 +0200 -+++ grass-8.3.1/db/drivers/mysql/db.c 2024-01-03 16:54:24.939317306 +0100 -@@ -54,7 +54,9 @@ - - connection = mysql_init(NULL); - res = mysql_real_connect(connection, host, user, password, -- connpar.dbname, port, NULL, 0); -+ connpar.dbname, -+ port != NULL ? atoi(port) : 0, -+ NULL, 0); - - if (res == NULL) { - db_d_append_error("%s\n%s", _("Connection failed."), diff --git a/grass.spec b/grass.spec index 4e9b303..557b5ec 100644 --- a/grass.spec +++ b/grass.spec @@ -1,9 +1,9 @@ -%global shortver 83 +%global shortver 84 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.3.2 -Release: 4%{?dist} +Version: 8.4.0 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -30,7 +30,6 @@ Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.ta # fix pkgconfig file Patch 0: grass-pkgconfig.patch -Patch1: grass-c99.patch BuildRequires: bison %if %{with flexiblas} @@ -157,7 +156,6 @@ GRASS GIS development headers %prep %setup -q %patch 0 -p1 -b.libdir -%patch -P 1 -p1 # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure @@ -338,6 +336,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Jul 28 2024 Markus Neteler - 8.4.0-1 +- Update to 8.4.0 + * Thu Jul 18 2024 Fedora Release Engineering - 8.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 20a96a5..22bedcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.3.2.tar.gz) = 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0 +SHA512 (grass-8.4.0.tar.gz) = c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4 From f4fe1ca843403c0541fb6b3590d099e0264e728b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 6 Sep 2024 20:31:32 +0200 Subject: [PATCH 40/62] Rebuild (PDAL) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 557b5ec..e267f3a 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -336,6 +336,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Fri Sep 06 2024 Sandro Mani - 8.4.0-2 +- Rebuild (PDAL) + * Sun Jul 28 2024 Markus Neteler - 8.4.0-1 - Update to 8.4.0 From 665d05df728fb50334fb3786558ffca08e648e77 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Tue, 17 Sep 2024 17:39:54 +0200 Subject: [PATCH 41/62] Remove unrelated CHANGES file from license macro --- grass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index e267f3a..8f302f6 100644 --- a/grass.spec +++ b/grass.spec @@ -318,7 +318,7 @@ 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 %dir %{_libdir}/%{name}%{shortver}/driver From 6a2631f644009b2a543bd905408c28d9ba44c7ed Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Tue, 15 Oct 2024 15:45:15 +0200 Subject: [PATCH 42/62] New EPEL10 branch --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 067d726..11b6f71 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /grass-.tar.gz /grass-8.3.1.tar.gz /grass-8.3.2.tar.gz +/grass-8.4.0.tar.gz diff --git a/sources b/sources index 20a96a5..22bedcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.3.2.tar.gz) = 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0 +SHA512 (grass-8.4.0.tar.gz) = c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4 From d4ca6db19531df7273c980b2c8678d10ddfdb9cc Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 26 Oct 2024 23:01:50 +0200 Subject: [PATCH 43/62] =?UTF-8?q?Sort=20requirements=20and=20flags=20(http?= =?UTF-8?q?s://github.com/OSGeo/grass/pull/4563/=20by=20Edouard=20Choini?= =?UTF-8?q?=C3=A8re)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- grass.spec | 129 ++++++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 61 deletions(-) diff --git a/grass.spec b/grass.spec index 8f302f6..3e4675d 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -37,41 +37,41 @@ 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 BuildRequires: freetype-devel +BuildRequires: gcc-c++ BuildRequires: gdal-devel BuildRequires: geos-devel BuildRequires: gettext BuildRequires: laszip-devel BuildRequires: libappstream-glib 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 -BuildRequires: netcdf-devel -BuildRequires: python3 -%if 0%{?rhel} == 7 -# EPEL7 -BuildRequires: python%{python3_version_nodots}-numpy -%else -BuildRequires: python3-numpy -%endif %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 +%if (0%{?rhel} > 7 || 0%{?fedora}) +BuildRequires: mariadb-connector-c-devel openssl-devel +%else +BuildRequires: mysql-devel +%endif +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +BuildRequires: netcdf-devel +BuildRequires: PDAL +BuildRequires: PDAL-devel +BuildRequires: PDAL-libs BuildRequires: proj-devel +BuildRequires: python3 %if 0%{?rhel} == 7 # EPEL7 BuildRequires: python%{python3_version_nodots}-dateutil @@ -79,22 +79,24 @@ BuildRequires: python%{python3_version_nodots}-dateutil BuildRequires: python3-dateutil %endif BuildRequires: python3-devel +%if 0%{?rhel} == 7 +# EPEL7 +BuildRequires: python%{python3_version_nodots}-numpy +%else +BuildRequires: python3-numpy +%endif BuildRequires: python3-pillow -BuildRequires: PDAL -BuildRequires: PDAL-libs -BuildRequires: PDAL-devel 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 +Requires: libzstd +Requires: PDAL +Requires: PDAL-libs # fedora >= 34: Nothing %if (0%{?rhel} > 7 || 0%{?fedora} < 34) Requires: proj-datumgrid @@ -103,26 +105,23 @@ Requires: proj-datumgrid-world Requires: python3 %if 0%{?rhel} == 7 # EPEL7 -Requires: python%{python3_version_nodots}-numpy -%else -Requires: python3-numpy -%endif -%if 0%{?rhel} == 7 -# EPEL7 Requires: python%{python3_version_nodots}-dateutil %else Requires: python3-dateutil %endif +%if 0%{?rhel} == 7 +# EPEL7 +Requires: python%{python3_version_nodots}-numpy +%else +Requires: python3-numpy +%endif Requires: python3-wxpython4 -Requires: PDAL -Requires: PDAL-libs %if "%{_lib}" == "lib" %global cpuarch 32 %else %global cpuarch 64 %endif - Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -170,45 +169,50 @@ 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-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 \ - --with-freetype \ - --with-nls \ - --with-pdal \ - --with-readline \ - --with-regex \ - --with-openmp \ - --with-gdal=%{_bindir}/gdal-config \ - --with-geos=%{_bindir}/geos-config \ - --with-netcdf=%{_bindir}/nc-config \ --with-mysql-includes=%{_includedir}/mysql \ %if (0%{?fedora} >= 27) --with-mysql-libs=%{_libdir} \ %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 @@ -336,6 +340,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Oct 26 2024 Markus Neteler - 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 - 8.4.0-2 - Rebuild (PDAL) From d4715aa6a1075f1c5c9fa5209e5845a00e43cdd5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 9 Nov 2024 08:47:20 +0100 Subject: [PATCH 44/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 3e4675d..dc84685 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -340,6 +340,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Nov 09 2024 Sandro Mani - 8.4.0-4 +- Rebuild (gdal) + * Sat Oct 26 2024 Markus Neteler - 8.4.0-3 - Sort requirements and flags (https://github.com/OSGeo/grass/pull/4563/ by Edouard Choinière) From f6c317a8541a0d351d44d6c89888362601ae90a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 05:08:05 +0000 Subject: [PATCH 45/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index dc84685..f27952a 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -340,6 +340,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 8.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Nov 09 2024 Sandro Mani - 8.4.0-4 - Rebuild (gdal) From be3b12a26283328d3d620ac17083f4251a49c828 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Mon, 10 Feb 2025 17:03:00 +0100 Subject: [PATCH 46/62] EPEL10: fix proj-datumgrid condition --- grass.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/grass.spec b/grass.spec index f27952a..71c1f35 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -97,8 +97,8 @@ Requires: geos Requires: libzstd Requires: PDAL Requires: PDAL-libs -# fedora >= 34: Nothing -%if (0%{?rhel} > 7 || 0%{?fedora} < 34) +# fedora >= 34 or RHEL > 9: Nothing +%if ( (0%{?rhel} > 7 && 0%{?rhel} < 10) || 0%{?fedora} < 34) Requires: proj-datumgrid Requires: proj-datumgrid-world %endif @@ -340,6 +340,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Feb 10 2025 Markus Neteler - 8.4.0-6 +- EPEL10: fix proj-datumgrid condition + * Fri Jan 17 2025 Fedora Release Engineering - 8.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4d7489beeef0cb82d2df851509bf35c967c03570 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Mon, 10 Feb 2025 17:03:00 +0100 Subject: [PATCH 47/62] EPEL10: fix proj-datumgrid condition --- grass.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/grass.spec b/grass.spec index f27952a..71c1f35 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -97,8 +97,8 @@ Requires: geos Requires: libzstd Requires: PDAL Requires: PDAL-libs -# fedora >= 34: Nothing -%if (0%{?rhel} > 7 || 0%{?fedora} < 34) +# fedora >= 34 or RHEL > 9: Nothing +%if ( (0%{?rhel} > 7 && 0%{?rhel} < 10) || 0%{?fedora} < 34) Requires: proj-datumgrid Requires: proj-datumgrid-world %endif @@ -340,6 +340,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Feb 10 2025 Markus Neteler - 8.4.0-6 +- EPEL10: fix proj-datumgrid condition + * Fri Jan 17 2025 Fedora Release Engineering - 8.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From af4574c08772286654dbb59411439111d5bb82bb Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 22 Feb 2025 19:03:43 +0100 Subject: [PATCH 48/62] drop outdated proj-datumgrid condition --- grass.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/grass.spec b/grass.spec index 71c1f35..7cb0c69 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -97,11 +97,6 @@ Requires: geos Requires: libzstd Requires: PDAL Requires: PDAL-libs -# fedora >= 34 or RHEL > 9: Nothing -%if ( (0%{?rhel} > 7 && 0%{?rhel} < 10) || 0%{?fedora} < 34) -Requires: proj-datumgrid -Requires: proj-datumgrid-world -%endif Requires: python3 %if 0%{?rhel} == 7 # EPEL7 @@ -340,6 +335,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Feb 22 2025 Markus Neteler - 8.4.0-7 +- drop outdated proj-datumgrid condition + * Mon Feb 10 2025 Markus Neteler - 8.4.0-6 - EPEL10: fix proj-datumgrid condition From 56cb9ca33c7d339ae8de85803d5796d08859cf3f Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Tue, 25 Feb 2025 14:15:02 +0100 Subject: [PATCH 49/62] Update to GRASS GIS 8.4.1 --- grass.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grass.spec b/grass.spec index 7cb0c69..ced154a 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.4.0 -Release: 7%{?dist} +Version: 8.4.1 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -335,6 +335,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Feb 24 2025 Fedora Release Monitoring - 8.4.1-1 +- Update to 8.4.1 (#2347356) + * Sat Feb 22 2025 Markus Neteler - 8.4.0-7 - drop outdated proj-datumgrid condition From 38a79d7b341f909d8df625f2dc3c817e09adefdd Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Tue, 25 Feb 2025 15:02:20 +0100 Subject: [PATCH 50/62] Add grass-8.4.1.tar.gz --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 11b6f71..c288770 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /grass-8.3.1.tar.gz /grass-8.3.2.tar.gz /grass-8.4.0.tar.gz +/grass-8.4.1.tar.gz diff --git a/sources b/sources index 22bedcf..eea6e29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.4.0.tar.gz) = c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4 +SHA512 (grass-8.4.1.tar.gz) = b24c017910e83a26566af0f2dd6c6cac86d69027dd209923b049b5e15f5dae96820ac57b4332ebec7254662aa94a4a5a07d376941fb829b6327de0652de35d32 From 42c0b3fa9812202ce6c116442b121783b876f790 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Wed, 16 Apr 2025 14:26:28 +0200 Subject: [PATCH 51/62] 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 --- grass.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/grass.spec b/grass.spec index ced154a..9086d24 100644 --- a/grass.spec +++ b/grass.spec @@ -59,11 +59,7 @@ BuildRequires: libtiff-devel BuildRequires: libXmu-devel BuildRequires: libzstd-devel BuildRequires: make -%if (0%{?rhel} > 7 || 0%{?fedora}) BuildRequires: mariadb-connector-c-devel openssl-devel -%else -BuildRequires: mysql-devel -%endif BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: netcdf-devel From cb7e5cafb8466f5ea63793c7c8b1452a4a5b6a96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:35:49 +0000 Subject: [PATCH 52/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 9086d24..e74eba6 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 8.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Feb 24 2025 Fedora Release Monitoring - 8.4.1-1 - Update to 8.4.1 (#2347356) From 949a64e7715b543b7b1f0ac84a1a73294ddf09e6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 30 Jul 2025 08:56:29 +0200 Subject: [PATCH 53/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index e74eba6..2699ee6 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Wed Jul 30 2025 Sandro Mani - 8.4.1-3 +- Rebuild (gdal) + * Thu Jul 24 2025 Fedora Release Engineering - 8.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 958d42b7fe648bd818e0c67da7d35798adb53606 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 3 Aug 2025 20:56:10 +0200 Subject: [PATCH 54/62] Rebuild (grass) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 2699ee6..a9d77b9 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Aug 03 2025 Sandro Mani - 8.4.1-4 +- Rebuild (grass) + * Wed Jul 30 2025 Sandro Mani - 8.4.1-3 - Rebuild (gdal) From cfcf1c3780aa9b9f11ed0cc8155f171692ac4b2a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 3 Aug 2025 21:18:33 +0200 Subject: [PATCH 55/62] Fix changelog entry --- grass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index a9d77b9..547b191 100644 --- a/grass.spec +++ b/grass.spec @@ -332,7 +332,7 @@ fi %changelog * Sun Aug 03 2025 Sandro Mani - 8.4.1-4 -- Rebuild (grass) +- Rebuild (PDAL) * Wed Jul 30 2025 Sandro Mani - 8.4.1-3 - Rebuild (gdal) From 6b9a9250a81f51bae740de4fa80cab4ff8654135 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:51:02 +0200 Subject: [PATCH 56/62] Rebuilt for Python 3.14.0rc2 bytecode --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 547b191..3e249d6 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Fri Aug 15 2025 Python Maint - 8.4.1-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Sun Aug 03 2025 Sandro Mani - 8.4.1-4 - Rebuild (PDAL) From 96a58932e1b25e6bb1bfe1e6e6d8d22ff62e42fe Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 08:39:01 -0600 Subject: [PATCH 57/62] Rebuild for netcdf 4.9.3 soname bump --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 3e249d6..9d984b8 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Fri Aug 22 2025 Orion Poplawski - 8.4.1-6 +- Rebuild for netcdf 4.9.3 soname bump + * Fri Aug 15 2025 Python Maint - 8.4.1-5 - Rebuilt for Python 3.14.0rc2 bytecode From e64ca5da4b56ecfe59b7731e7059f2a5385e436e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:20:41 +0200 Subject: [PATCH 58/62] Rebuilt for Python 3.14.0rc3 bytecode --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 9d984b8..9756e44 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Fri Sep 19 2025 Python Maint - 8.4.1-7 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 22 2025 Orion Poplawski - 8.4.1-6 - Rebuild for netcdf 4.9.3 soname bump From 8ac5aa690e5f2f6bb3f19a08af0ef9dee3e6944c Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sat, 27 Sep 2025 18:34:32 +0200 Subject: [PATCH 59/62] Rebuilt for F43 (#2396704) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 9756e44..7ccc2b2 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sat Sep 27 2025 Markus Neteler - 8.4.1-8 +- Rebuilt for F43 + * Fri Sep 19 2025 Python Maint - 8.4.1-7 - Rebuilt for Python 3.14.0rc3 bytecode From 72396d5007b74e62545bbdfd46c38ea707ccf0a2 Mon Sep 17 00:00:00 2001 From: Markus Neteler Date: Sun, 23 Nov 2025 15:38:17 +0100 Subject: [PATCH 60/62] Update to GRASS 8.4.2 (#2416357) --- .gitignore | 1 + grass.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c288770..7b9c2ac 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /grass-8.3.2.tar.gz /grass-8.4.0.tar.gz /grass-8.4.1.tar.gz +/grass-8.4.2.tar.gz diff --git a/grass.spec b/grass.spec index 7ccc2b2..f7b0101 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 8.4.1 -Release: 8%{?dist} +Version: 8.4.2 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Nov 23 2025 Markus Neteler - 8.4.2-1 +- Update to GRASS 8.4.2 (#2416357) + * Sat Sep 27 2025 Markus Neteler - 8.4.1-8 - Rebuilt for F43 diff --git a/sources b/sources index eea6e29..9ae3f53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-8.4.1.tar.gz) = b24c017910e83a26566af0f2dd6c6cac86d69027dd209923b049b5e15f5dae96820ac57b4332ebec7254662aa94a4a5a07d376941fb829b6327de0652de35d32 +SHA512 (grass-8.4.2.tar.gz) = bbbe219b0d4a7075374c7f8b11de838f014ea0bce84a22dc9089d65fe49fd4f41d8e39867f08fa12ab46e8ff883389c22ccb9976ef89c2fed24834d1ba5cf6fb From 05e0b149d21439ce34395e7cd82c75c03228781e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Nov 2025 22:37:38 +0100 Subject: [PATCH 61/62] Rebuild (gdal) --- grass.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index f7b0101..00ff8cb 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -331,6 +331,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Sun Nov 23 2025 Sandro Mani - 8.4.2-2 +- Rebuild (gdal) + * Sun Nov 23 2025 Markus Neteler - 8.4.2-1 - Update to GRASS 8.4.2 (#2416357) From 398edf0a84eaabfb4bbba8f71826a4e40d449dca Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jan 2026 19:09:15 -0500 Subject: [PATCH 62/62] Drop support for i686 --- grass.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/grass.spec b/grass.spec index 00ff8cb..3f88780 100644 --- a/grass.spec +++ b/grass.spec @@ -3,7 +3,7 @@ Name: grass Version: 8.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -31,6 +31,9 @@ Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.ta # fix pkgconfig file Patch 0: grass-pkgconfig.patch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: bison %if %{with flexiblas} BuildRequires: flexiblas-devel @@ -331,6 +334,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Wed Jan 14 2026 Elliott Sales de Andrade - 8.4.2-3 +- Drop support for i686 + * Sun Nov 23 2025 Sandro Mani - 8.4.2-2 - Rebuild (gdal)