diff --git a/0001-Use-a-dgettext-function-returning-strings-instead-of.patch b/0001-Use-a-dgettext-function-returning-strings-instead-of.patch new file mode 100644 index 0000000..fda94b9 --- /dev/null +++ b/0001-Use-a-dgettext-function-returning-strings-instead-of.patch @@ -0,0 +1,29 @@ +From f09c07c847bb5be6f749d102143e8b43a1a00b7c Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Wed, 22 Jul 2015 15:54:03 +0200 +Subject: [PATCH] Use a dgettext function returning strings instead of bytes + +ldgettext returns an array of bytes in system encoding and this, together with +Python3, causes troubles. + +Signed-off-by: Matej Habrnal +--- + src/client-python/reportclient/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/client-python/reportclient/__init__.py b/src/client-python/reportclient/__init__.py +index 7b59586..43afc53 100644 +--- a/src/client-python/reportclient/__init__.py ++++ b/src/client-python/reportclient/__init__.py +@@ -36,7 +36,7 @@ GETTEXT_PROGNAME = "libreport" + import locale + import gettext + +-_ = lambda x: gettext.ldgettext(GETTEXT_PROGNAME, x) ++_ = lambda x: gettext.dgettext(GETTEXT_PROGNAME, x) + + def init_gettext(): + try: +-- +2.4.6 + diff --git a/libreport.spec b/libreport.spec index 089822b..d41e148 100644 --- a/libreport.spec +++ b/libreport.spec @@ -7,7 +7,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.6.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://abrt.readthedocs.org/ @@ -16,6 +16,7 @@ Source1: autogen.sh # git format-patch %%{Version} -N -M --topo-order # i=0; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done +Patch0001: 0001-Use-a-dgettext-function-returning-strings-instead-of.patch # git is need for '%%autosetup -S git' which automatically applies all the # patches above. Please, be aware that the patches must be generated @@ -732,6 +733,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Jul 22 2015 Matej Habrnal 2.6.2-2 +- Use a dgettext function returning strings instead of bytes + * Fri Jul 17 2015 Jakub Filak 2.6.2-1 - avoid starvation in processes concurrently accessing a dump directory - bugzilla: Add check for extra-cc file