[redhat-rpm-config] Drop (un)setting LANG and DISPLAY in build stages, require rpm >= 4.8.0.
Toshio くらとみ
toshio at fedoraproject.org
Thu Oct 4 01:19:59 UTC 2012
commit 5c4ec180bc9c6a96d04509a5ebce0d19c8c1fa25
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed Oct 3 18:19:33 2012 -0700
Drop (un)setting LANG and DISPLAY in build stages, require rpm >= 4.8.0.
...ting-LANG-and-DISPLAY-in-various-build-st.patch | 47 ++++++++++++++++++++
redhat-rpm-config.spec | 10 +++-
2 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch b/0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
new file mode 100644
index 0000000..23d2095
--- /dev/null
+++ b/0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
@@ -0,0 +1,47 @@
+From 17d08cd3942405e20889ba7d420191993c93a12f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Sun, 25 Sep 2011 11:25:34 +0300
+Subject: [PATCH] Drop (un)setting LANG and DISPLAY in various build stages.
+
+rpm >= 4.8.0 takes care of that itself.
+---
+ macros | 21 ---------------------
+ 1 files changed, 0 insertions(+), 21 deletions(-)
+
+diff --git a/macros b/macros
+index 1ac46d7..a6bf95d 100644
+--- a/macros
++++ b/macros
+@@ -129,29 +129,8 @@ package or when debugging this package.\
+ %endif\
+ %{nil}
+
+-# Bad hack to set $LANG to C during all RPM builds
+-%prep \
+-%%prep\
+-LANG=C\
+-export LANG\
+-unset DISPLAY\
+-%{nil}
+-
+-%build %%build\
+-LANG=C\
+-export LANG\
+-unset DISPLAY\
+-%{nil}
+-
+ %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
+ %%install\
+-LANG=C\
+-export LANG\
+-unset DISPLAY\
+-%{nil}
+-
+-%check %%check\
+-unset DISPLAY\
+ %{nil}
+
+ #
+--
+1.7.6
+
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 9945f74..b7c6f70 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 9.1.0
-Release: 34%{?dist}
+Release: 35%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@@ -39,10 +39,12 @@ Patch12:redhat-rpm-config-9.1.0-use-prefix-macro.patch
Patch13: redhat-rpm-config-9.1.0-kernel-source.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=465664
Patch14: redhat-rpm-config-9.1.0-java-repack-order.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=741089
+Patch15: 0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
BuildArch: noarch
Requires: coreutils
Requires: perl-srpm-macros
-Requires: rpm >= 4.6.0
+Requires: rpm >= 4.8.0
Requires: dwz >= 0.4
Requires: zip
BuildRequires: libtool
@@ -67,6 +69,7 @@ Red Hat specific rpm configuration files.
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
%build
@@ -88,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/*
%changelog
+* Wed Oct 3 2012 Ville Skyttä <ville.skytta at iki.fi> - 9.1.0-35
+- Drop (un)setting LANG and DISPLAY in build stages, require rpm >= 4.8.0.
+
* Wed Oct 3 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 9.1.0-34
- Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433
to fix spaces in files and directories that are fed to the
More information about the scm-commits
mailing list