[packages/rpm-build-macros] - up to 1.727; use C.UTF-8 locale because meson wants utf8 locale

arekm arekm at pld-linux.org
Sat Oct 21 11:41:33 CEST 2017


commit e2329ed5e3880f908d164c82ce6cd8ceead37e6f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Oct 21 11:41:26 2017 +0200

    - up to 1.727; use C.UTF-8 locale because meson wants utf8 locale

 rpm-build-macros.spec | 2 +-
 rpm.macros            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 3e0802a..a076cb2 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.726
+%define		rpm_macros_rev	1.727
 %define		find_lang_rev	1.40
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 487d64b..cec3abb 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -331,7 +331,7 @@ CFLAGS="${CFLAGS:-%{rpmcflags}}" \
 CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \
 CXXFLAGS="${CXXFLAGS:-%{rpmcxxflags}}" \
 LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \
-LC_ALL=en_GB.UTF-8 %{__meson} \
+LC_ALL=C.UTF-8 %{__meson} \
 	--buildtype=plain \
 	--bindir=%{_bindir} \
 	--datadir=%{_datadir} \
@@ -348,9 +348,9 @@ LC_ALL=en_GB.UTF-8 %{__meson} \
 	--sysconfdir=%{_sysconfdir} \
 	--wrap-mode=%{__meson_wrap_mode} \
 }
-%meson_build %ninja_build
-%meson_install %ninja_install
-%meson_test %ninja_test
+%meson_build LC_ALL=C.UTF-8 %ninja_build
+%meson_install LC_ALL=C.UTF-8 %ninja_install
+%meson_test LC_ALL=C.UTF-8 %ninja_test
 
 # ninja
 %ninja_build %{__ninja} %{__ninja_common_opts}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/e2329ed5e3880f908d164c82ce6cd8ceead37e6f



More information about the pld-cvs-commit mailing list