rpm: Uprev to RPM 5.4.0

Update RPM to the latest release, RPM 5.4.0.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index fbe0626d6e..7c2cdb0bde 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -46,8 +46,7 @@ package_update_index_rpm () {
                                 -D "_dbpath $pkgdir/solvedb" --justdb \
                                 --noaid --nodeps --noorder --noscripts --notriggers --noparentdirs --nolinktos --stats \
                                 --ignoresize --nosignature --nodigest \
-                                -D "_dbi_tags_3 Packages:Name:Basenames:Providename:Nvra" \
-                                -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync" \
+                                -D "__dbi_txn create nofsync" \
                                 $pkgdir/solvedb/manifest
                         echo $pkgdir/solvedb >> ${DEPLOY_DIR_RPM}/solvedb.conf
                 fi
@@ -530,6 +529,8 @@ python do_package_rpm () {
         cmd = cmd + " --define '_use_internal_dependency_generator 0'"
         cmd = cmd + " --define '__find_requires " + outdepends + "'"
         cmd = cmd + " --define '__find_provides " + outprovides + "'"
+        cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
+        cmd = cmd + " --define 'debug_package %{nil}'"
         cmd = cmd + " -bb " + outspecfile
 
         # Build the spec file!