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)