aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFunda Wang <fwang@mageia.org>2012-11-02 02:55:00 +0000
committerFunda Wang <fwang@mageia.org>2012-11-02 02:55:00 +0000
commit975c9d69d6fac35f07086cc03a20bdc8fd3b288c (patch)
tree9f27679792b1e1722fc9c686c010f8d6913e0bf2
parentdb85ce94915c8ca0b8898f08ab1f145586bc4a7c (diff)
downloadrpm-setup-975c9d69d6fac35f07086cc03a20bdc8fd3b288c.tar
rpm-setup-975c9d69d6fac35f07086cc03a20bdc8fd3b288c.tar.gz
rpm-setup-975c9d69d6fac35f07086cc03a20bdc8fd3b288c.tar.bz2
rpm-setup-975c9d69d6fac35f07086cc03a20bdc8fd3b288c.tar.xz
rpm-setup-975c9d69d6fac35f07086cc03a20bdc8fd3b288c.zip
1.162: set LC_CTYPE as UTF-8 when building gem1.162
-rw-r--r--NEWS3
-rw-r--r--build.macros.in2
-rw-r--r--configure.ac2
3 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4747df6..0a57496 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.162 - 2 Nov 2012, by Funda Wang
+- set LC_CTYPE as UTF-8 when building gem
+
Version 1.161 - 24 Oct 2012, by Thierry Vignaud
- set LC_ALL=C in find-{provides,requires} (mga#7883)
diff --git a/build.macros.in b/build.macros.in
index f5debdb..55f6e46 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -483,11 +483,13 @@ popd
%__gem_helper @RPMVENDORDIR@/gem_helper.rb
%gem_build(f:j:) \
+ export LC_CTYPE=UTF-8 \
%__gem_helper build \\\
%{-f:-f%{-f*}} \\\
%{!-j:%{_smp_mflags}}%{-j:-j%{-j*}}
%gem_install(i:n:C) \
+ export LC_CTYPE=UTF-8 \
DESTDIR=${DESTDIR:-%{buildroot}} \\\
%__gem_helper install \\\
--env-shebang --rdoc --ri --force --ignore-dependencies \\\
diff --git a/configure.ac b/configure.ac
index d519ea6..b692a6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.161, tv@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.162, tv@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR