[packages/rpm] - rel 6; unset more variables (to match rpm 5)
arekm
arekm at pld-linux.org
Thu Feb 25 08:19:40 CET 2021
commit fb2f44e38817983eac93a537d46b7d69510bd56f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Feb 25 08:19:29 2021 +0100
- rel 6; unset more variables (to match rpm 5)
build-locale.patch | 12 ++++++++----
rpm.spec | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 56b34ad..a8b747b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.16.1.2
-Release: 5
+Release: 6
Epoch: 1
License: GPL v2 / LGPL v2.1
Group: Base
diff --git a/build-locale.patch b/build-locale.patch
index 3da21c7..49a846b 100644
--- a/build-locale.patch
+++ b/build-locale.patch
@@ -1,6 +1,6 @@
---- rpm-4.16.1.2/macros.in~ 2020-09-30 09:48:01.000000000 +0200
-+++ rpm-4.16.1.2/macros.in 2021-02-24 21:04:15.804801937 +0100
-@@ -815,6 +815,8 @@
+--- rpm-4.16.1.2.org/macros.in 2021-02-25 08:15:48.438647368 +0100
++++ rpm-4.16.1.2/macros.in 2021-02-25 08:18:39.103948354 +0100
+@@ -818,9 +818,11 @@ package or when debugging this package.\
RPM_PACKAGE_VERSION=\"%{VERSION}\"\
RPM_PACKAGE_RELEASE=\"%{RELEASE}\"\
export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
@@ -8,4 +8,8 @@
+ export LC_ALL\
LANG=C\
export LANG\
- unset CDPATH DISPLAY ||:\
+- unset CDPATH DISPLAY ||:\
++ unset CDPATH DISPLAY LANGUAGE LINGUAS PERL_MM_OPT||:\
+ %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
+ export RPM_BUILD_ROOT}\
+ %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/fb2f44e38817983eac93a537d46b7d69510bd56f
More information about the pld-cvs-commit
mailing list