fix regression overwriting variables from /etc/os-release

http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-September/023647.html
http://rpm5.org/community/rpm-devel/5550.html
http://rpm5.org/community/rpm-devel/5552.html

diff --git a/rpm-5.4.13-dont-override-existing-variables-with-etc-os-release.patch b/rpm-5.4.13-dont-override-existing-variables-with-etc-os-release.patch
new file mode 100644 (file)
index 0000000..b5ebc88
--- /dev/null
+++ b/rpm-5.4.13-dont-override-existing-variables-with-etc-os-release.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.13/configure.ac~   2013-08-26 21:59:50.601111413 +0200
++++ rpm-5.4.13/configure.ac    2013-08-26 21:59:51.917134583 +0200
+@@ -2255,7 +2255,7 @@ unknown|pc|ibm|redhat|pld|mandriva|conec
+       test -f /usr/bin/crux &&                RPMCANONVENDOR=crux
+       test -f /etc/ark-release &&             RPMCANONVENDOR=ark
+       test -f /etc/openmamba-release &&       RPMCANONVENDOR=openmamba
+-      test -r /etc/os-release &&. /etc/os-release && [ -n "$ID" ] && RPMCANONVENDOR="$ID"
++      test -r /etc/os-release && ID=$(. /etc/os-release && [ -n "$ID" ] && echo "$ID") && RPMCANONVENDOR="$ID"
+       ;;
+ esac
+ RPMCANONOS="$target_os_noversion"

diff --git a/rpm.spec b/rpm.spec
index b46091b6e68955e866dedc52e8a98113aac798ba..c51bd4ef47845bf04ceb69241f25e17b6e9fab2c 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -43,7 +43,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.13
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.13

-Release:       1
+Release:       2

 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.13-0.20130819.src.rpm
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.13-0.20130819.src.rpm


@@ -154,9 +154,9 @@ Patch70:    python-%{name}sense-missingok.patch
 Patch71:       %{name}-changelog-encoding.patch
 Patch72:       %{name}-preserve-tag-type.patch
 Patch73:       gem_helper-spec-arg.patch
 Patch71:       %{name}-changelog-encoding.patch
 Patch72:       %{name}-preserve-tag-type.patch
 Patch73:       gem_helper-spec-arg.patch

-Patch74:       rpm-fix-internal-lua-build.patch
-Patch75:       rpm-double_check_file_deps.patch
-Patch76:       rpm-revert-debugedit-breakage.patch
+Patch74:       %{name}-fix-internal-lua-build.patch
+Patch75:       %{name}-double_check_file_deps.patch
+Patch76:       %{name}-revert-debugedit-breakage.patch

 Patch77:       %{name}-lua-expat.patch
 
 # Patches imported from Mandriva
 Patch77:       %{name}-lua-expat.patch
 
 # Patches imported from Mandriva


@@ -273,6 +273,7 @@ Patch1044:  %{name}-5.4.12-fix-rpmlua-print.patch
 Patch1045:     %{name}-5.4.12-fix-rpmpython-module-import-init.patch
 Patch1046:     %{name}-5.4.12-truncate-output-buffer-after-use.patch
 Patch1047:     %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.patch
 Patch1045:     %{name}-5.4.12-fix-rpmpython-module-import-init.patch
 Patch1046:     %{name}-5.4.12-truncate-output-buffer-after-use.patch
 Patch1047:     %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.patch

+Patch1048:     %{name}-5.4.13-dont-override-existing-variables-with-etc-os-release.patch

 
 URL:           http://rpm5.org/
 BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver}
 
 URL:           http://rpm5.org/
 BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver}


@@ -952,6 +953,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1045 -p1
 %patch1046 -p1
 %patch1047 -p1
 %patch1045 -p1
 %patch1046 -p1
 %patch1047 -p1

+%patch1048 -p1

 %patch68 -p1
 %patch69 -p1
 
 %patch68 -p1
 %patch69 -p1