- make sure that locale is reset to C when running builds

- rel 5

diff --git a/build-locale.patch b/build-locale.patch
new file mode 100644 (file)
index 0000000..3da21c7
--- /dev/null
+++ b/build-locale.patch
@@ -0,0 +1,11 @@
+--- 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_PACKAGE_VERSION=\"%{VERSION}\"\
+   RPM_PACKAGE_RELEASE=\"%{RELEASE}\"\
+   export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
++  LC_ALL=C\
++  export LC_ALL\
+   LANG=C\
+   export LANG\
+   unset CDPATH DISPLAY ||:\

diff --git a/rpm.spec b/rpm.spec
index 57a896ebe109d56628e7906bd701a6909a1cdc28..56b34ad8aa619b6eb7193f15277064beffdea3ff 100644 (file)
--- 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:       4
+Release:       5
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -83,6 +83,7 @@ Patch32:      noexpand.patch
 Patch33:       sqlite-db-backend.patch
 Patch34:       skip-symlinks.patch
 Patch35:       pl-po.patch
+Patch36:       build-locale.patch
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 BuildRequires: db-devel >= %{db_ver}
@@ -583,6 +584,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
 
 %{__rm} po/*.gmo