From 4e662060a999c83e1b7c348289ee2cf459bafd6f Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Tue, 9 Oct 2018 14:29:47 +0200 Subject: [PATCH] Explicitly using utf8 under install on el6 and el7 for python quirks --- varnish.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/varnish.spec b/varnish.spec index 97b73de..0a6842b 100644 --- a/varnish.spec +++ b/varnish.spec @@ -12,7 +12,7 @@ Summary: High-performance HTTP accelerator Name: varnish Version: 6.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Daemons URL: https://www.varnish-cache.org/ @@ -27,7 +27,7 @@ Patch12: varnish-6.0.1_fix_bug2668.patch Obsoletes: varnish-libs -%if 0%{?rhel} == 6 +%if 0%{?rhel} ==6 || 0%{?rhel} == 7 BuildRequires: python-sphinx python34-docutils %else BuildRequires: python3-sphinx, python3-docutils @@ -204,8 +204,8 @@ make %{?_smp_mflags} check LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{buildroot}% %install rm -rf %{buildroot} -# el6 defaults to LANG=C, which makes python3 fail on utf8 -%if 0%{?rhel} == 6 +# el6 and el7 defaults to LANG=C, which makes python3 fail on utf8 +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 export LANG=en_US.UTF-8 %endif @@ -373,9 +373,11 @@ fi %changelog +* Tue Oct 09 2018 Ingvar Hagelund - 6.0.1-3 +- Explicitly using utf8 under install on el6 and el7 for python quirks + * Tue Oct 09 2018 Ingvar Hagelund - 6.0.1-2 - Explicitly using python3 on all targets -- Explicitly using utf8 under install on el6 for python quirks * Thu Sep 27 2018 Ingvar Hagelund - 6.0.1-1 - New upstream release