rpm: Upgrade to version 5.4.16, rebase SELinux build patch.

Signed-off-by: Philip Tricca <flihp@twobit.us>

2 files changed, 8 insertions, 12 deletions

diff --git a/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch b/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
index d3d36d8..2ae406b 100644
--- a/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
+++ b/recipes-devtools/rpm/rpm/rpm-fix-build-bug.patch
@@ -7,19 +7,16 @@ Upstream-Status: Pending
  rpmio/macro.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/rpmio/macro.c b/rpmio/macro.c
-index 9f4cb01..cf9ede5 100644
---- a/rpmio/macro.c
-+++ b/rpmio/macro.c
-@@ -99,7 +99,7 @@ const char * rpmMacrofiles = MACROFILES;
- #include "debug.h"
+Index: rpm-5.4.15/rpmio/macro.c
+===================================================================
+--- rpm-5.4.15.orig/rpmio/macro.c
++++ rpm-5.4.15/rpmio/macro.c
+@@ -111,7 +111,7 @@ const char * rpmMacrofiles = MACROFILES;
+ #endif
  
  /*@unchecked@*/
--#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
+-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_MOZJS) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
 +#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SELINUX)
  static int _globalI = 0x80000000;
  #endif
  
--- 
-1.7.5.4
-
diff --git a/recipes-devtools/rpm/rpm_5.4.14.bbappend b/recipes-devtools/rpm/rpm_5.4.16.bbappend
index df5dcef..2a41a28 100644
--- a/recipes-devtools/rpm/rpm_5.4.14.bbappend
+++ b/recipes-devtools/rpm/rpm_5.4.16.bbappend
@@ -1,8 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://rpm-fix-build-bug.patch \
-           "
-
+          "
 FILES_${PN} += "${libdir}/rpm/bin/spooktool \
                 ${libdir}/rpm/bin/semodule \
                "