From 7eaf1882eccc74a33e771423af2d3f1ee5f57a8d Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Mon, 24 Nov 2014 14:56:35 -0800
Subject: [PATCH] rpm: cleanup for bash

Change-Id: Id5f7c443c54062985b2db832f03c8ca77f52cab4
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta-tizen-common-base/recipes-devtools/rpm/rpm-extraconf.inc | 6 +++---
 meta-tizen-common-base/recipes-devtools/rpm/rpm.inc           | 5 +++--
 meta-tizen-common-base/recipes-devtools/rpm/rpm_git.bb        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-tizen-common-base/recipes-devtools/rpm/rpm-extraconf.inc b/meta-tizen-common-base/recipes-devtools/rpm/rpm-extraconf.inc
index 56fb87e..655adc1 100644
--- a/meta-tizen-common-base/recipes-devtools/rpm/rpm-extraconf.inc
+++ b/meta-tizen-common-base/recipes-devtools/rpm/rpm-extraconf.inc
@@ -129,7 +129,7 @@ do_install() {
  chmod 755 ${D}${sysconfdir}/rpm
  mkdir -p ${D}${prefix}/lib/rpm/macros.d
  # remove some nonsense or non-working scripts
- pushd ${D}${prefix}/lib/rpm/
+ cd ${D}${prefix}/lib/rpm/
  for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
           magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
           brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
@@ -142,7 +142,7 @@ do_install() {
      rm -f "${i##*/}"
    fi
  done
- popd
+ cd ${S}
  rm -f ${D}${prefix}/lib/*.la
  rm -f ${D}${prefix}/lib/rpm-plugins/*.la
 
@@ -174,4 +174,4 @@ FILES_${PN}-dbg += "\
 
 DEPENDS_native += "popt-native"
 DEPENDS_native += "uthash-native"
-DEPENDS_native += "smack-native"
\ No newline at end of file
+DEPENDS_native += "smack-native"
diff --git a/meta-tizen-common-base/recipes-devtools/rpm/rpm.inc b/meta-tizen-common-base/recipes-devtools/rpm/rpm.inc
index e2921e6..ad85b34 100644
--- a/meta-tizen-common-base/recipes-devtools/rpm/rpm.inc
+++ b/meta-tizen-common-base/recipes-devtools/rpm/rpm.inc
@@ -214,7 +214,8 @@ do_install() {
  chmod 755 ${D}${sysconfdir}/rpm
  mkdir -p ${D}${prefix}/lib/rpm/macros.d
  # remove some nonsense or non-working scripts
- pushd ${D}${prefix}/lib/rpm/
+ CURDIR=$(pwd)
+ cd ${D}${prefix}/lib/rpm/
  for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
           magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
           brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
@@ -227,7 +228,7 @@ do_install() {
      rm -f "${i##*/}"
    fi
  done
- popd
+ cd ${CURDIR}
  rm -f ${D}${prefix}/lib/*.la
  rm -f ${D}${prefix}/lib/rpm-plugins/*.la
  
diff --git a/meta-tizen-common-base/recipes-devtools/rpm/rpm_git.bb b/meta-tizen-common-base/recipes-devtools/rpm/rpm_git.bb
index e7a97a9..323c442 100644
--- a/meta-tizen-common-base/recipes-devtools/rpm/rpm_git.bb
+++ b/meta-tizen-common-base/recipes-devtools/rpm/rpm_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/rpm;tag=fbac5c17e9f395d436a0dd57ce2e4ceda758d756;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/rpm;tag=beaf75391c4da89c2c7d399b4027a1c5a91f5f86;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
-- 
2.7.4