Drop (un)setting LANG and DISPLAY in build stages, require rpm >= 4.8.0.

This commit is contained in:
Toshio Kuratomi 2012-10-03 18:19:33 -07:00
parent 94c3f755ba
commit 5c4ec180bc
2 changed files with 55 additions and 2 deletions

View File

@ -0,0 +1,47 @@
From 17d08cd3942405e20889ba7d420191993c93a12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@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

View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 9.1.0 Version: 9.1.0
Release: 34%{?dist} Release: 35%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
Group: Development/System 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 Patch13: redhat-rpm-config-9.1.0-kernel-source.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=465664 # https://bugzilla.redhat.com/show_bug.cgi?id=465664
Patch14: redhat-rpm-config-9.1.0-java-repack-order.patch 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 BuildArch: noarch
Requires: coreutils Requires: coreutils
Requires: perl-srpm-macros Requires: perl-srpm-macros
Requires: rpm >= 4.6.0 Requires: rpm >= 4.8.0
Requires: dwz >= 0.4 Requires: dwz >= 0.4
Requires: zip Requires: zip
BuildRequires: libtool BuildRequires: libtool
@ -67,6 +69,7 @@ Red Hat specific rpm configuration files.
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%build %build
@ -88,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/* %{_sysconfdir}/rpm/*
%changelog %changelog
* Wed Oct 3 2012 Ville Skyttä <ville.skytta@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@fedoraproject.org> - 9.1.0-34 * Wed Oct 3 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 9.1.0-34
- Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433 - Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433
to fix spaces in files and directories that are fed to the to fix spaces in files and directories that are fed to the