[oe-commits] Marcin Juszkiewicz : rpm: use sed instead of ed - it is present in our metadata

[GIT User account]

Module: openembedded.git
Branch: hrw/poky-merge/add-rpm-packages-support
Commit: b38129392ebd92f1998895acc129921d90a7022f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b38129392ebd92f1998895acc129921d90a7022f

Author: Marcin Juszkiewicz <hrw at openembedded.org>
Date:   Wed Mar  4 21:26:58 2009 +0100

rpm: use sed instead of ed - it is present in our metadata

---

 packages/rpm/rpm_4.4.2.3.bb |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index fd131be..cb8bdd6 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
-DEPENDS = "zlib beecrypt file popt python"
-PR = "r12"
+DEPENDS = "zlib beecrypt file popt python sed-native"
+PR = "r13"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
@@ -64,14 +64,12 @@ do_configure () {
 	cd ${S}/db/dist
 	. ./RELEASE
 	# Edit version information we couldn't pre-compute.
-	(echo "1,\$s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" &&
-	 echo "1,\$s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" &&
-	 echo "1,\$s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" &&
-	 echo "1,\$s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" &&
-	 echo "1,\$s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" &&
-	 echo "1,\$s/__EDIT_DB_VERSION__/$DB_VERSION/g" &&
-	 echo "w" &&
-	 echo "q") | ed configure
+	sed -i -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g"  configure
+	sed -i -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g"  configure
+	sed -i -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g"  configure
+	sed -i -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g"  configure
+	sed -i -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g"  configure
+	sed -i -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g"  configure
 	cd ${S}/db3
 	${S}/db3/configure \
 		    --build=${BUILD_SYS} \