summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform2.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform2.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
index 79124bb6c4..fed54e5f11 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
@@ -13,10 +13,10 @@ ensures reasonable defaults are always available.
13 13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15 15
16Index: rpm-5.4.9/lib/rpmrc.c 16Index: rpm-5.4.14/lib/rpmrc.c
17=================================================================== 17===================================================================
18--- rpm-5.4.9.orig/lib/rpmrc.c 18--- rpm-5.4.14.orig/lib/rpmrc.c
19+++ rpm-5.4.9/lib/rpmrc.c 19+++ rpm-5.4.14/lib/rpmrc.c
20@@ -328,10 +328,15 @@ static void setDefaults(void) 20@@ -328,10 +328,15 @@ static void setDefaults(void)
21 /*@modifies rpmGlobalMacroContext, internalState @*/ 21 /*@modifies rpmGlobalMacroContext, internalState @*/
22 { 22 {
@@ -57,11 +57,11 @@ Index: rpm-5.4.9/lib/rpmrc.c
57 } 57 }
58 58
59 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ 59 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
60Index: rpm-5.4.9/macros/macros.in 60Index: rpm-5.4.14/macros/macros.in
61=================================================================== 61===================================================================
62--- rpm-5.4.9.orig/macros/macros.in 62--- rpm-5.4.14.orig/macros/macros.in
63+++ rpm-5.4.9/macros/macros.in 63+++ rpm-5.4.14/macros/macros.in
64@@ -875,9 +875,9 @@ $_arbitrary_tags_tests Foo:Bar 64@@ -900,9 +900,9 @@ $_arbitrary_tags_tests Foo:Bar
65 %_os @RPMCANONOS@ 65 %_os @RPMCANONOS@
66 %_gnu @RPMCANONGNU@ 66 %_gnu @RPMCANONGNU@
67 67
@@ -74,7 +74,7 @@ Index: rpm-5.4.9/macros/macros.in
74 74
75 #============================================================================== 75 #==============================================================================
76 # ---- configure macros. 76 # ---- configure macros.
77@@ -920,9 +920,10 @@ $_arbitrary_tags_tests Foo:Bar 77@@ -945,9 +945,10 @@ $_arbitrary_tags_tests Foo:Bar
78 %_build_os %{_host_os} 78 %_build_os %{_host_os}
79 %_host @host@ 79 %_host @host@
80 %_host_alias @host_alias@%{nil} 80 %_host_alias @host_alias@%{nil}
@@ -88,10 +88,10 @@ Index: rpm-5.4.9/macros/macros.in
88 %_target %{_host} 88 %_target %{_host}
89 %_target_alias %{_host_alias} 89 %_target_alias %{_host_alias}
90 %_target_cpu %{_host_cpu} 90 %_target_cpu %{_host_cpu}
91Index: rpm-5.4.9/python/rpmmodule.c 91Index: rpm-5.4.14/python/rpmmodule.c
92=================================================================== 92===================================================================
93--- rpm-5.4.9.orig/python/rpmmodule.c 93--- rpm-5.4.14.orig/python/rpmmodule.c
94+++ rpm-5.4.9/python/rpmmodule.c 94+++ rpm-5.4.14/python/rpmmodule.c
95@@ -65,8 +65,8 @@ static PyObject * archScore(PyObject * s 95@@ -65,8 +65,8 @@ static PyObject * archScore(PyObject * s
96 if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch)) 96 if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch))
97 return NULL; 97 return NULL;