From 31db57909f3e2713a3da2c33fe2759e0874fdd22 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 18 2018 21:02:31 +0000 Subject: Drop explicit locale setting Python3 now sets unicode locale automatically, this workaround should not be necessary anymore. For python2, let's use the lighter locale. --- diff --git a/python-rospkg.spec b/python-rospkg.spec index f63bdab..56ed556 100644 --- a/python-rospkg.spec +++ b/python-rospkg.spec @@ -9,7 +9,7 @@ Name: python-%{srcname} Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities for ROS package, stack, and distribution information License: BSD @@ -116,7 +116,7 @@ cd %{srcname} %if 0%{?rhel} && 0%{?rhel} < 7 LANG=en_US.utf8 PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests1.1 -w test %else -LANG=en_US.utf8 PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests -w test +LANG=C.utf8 PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests -w test %endif # Put the source folder back to its original name cd .. @@ -129,7 +129,7 @@ cd .. mv %{py3dir} %{srcname} cd %{srcname} # Run the nosetests -LANG=en_US.utf8 PYTHONPATH=%{buildroot}%{python3_sitelib} nosetests-%{python3_version} -w test +PYTHONPATH=%{buildroot}%{python3_sitelib} nosetests-%{python3_version} -w test # Put the source folder back to its original name cd .. mv %{srcname} %{py3dir} @@ -171,6 +171,10 @@ popd %endif %changelog +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1.1.7-2 +- Drop explicit locale setting for python3, use C.UTF-8 for python2 + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + * Thu Sep 13 2018 Scott K Logan - 1.1.7-1 - Update to 1.1.7 (rhbz#1441445)