From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 5 May 2004 02:19:07 +0000 (-0400)
Subject: Use rpmbuild if it is installed instead of rpm
X-Git-Tag: E2FSPROGS-1_36~163
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a9998585d5bc1f2df9a3e1c2ce686c34a40c3617;p=tools%2Fe2fsprogs.git

Use rpmbuild if it is installed instead of rpm
---

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index cad3355..43a51b9 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-19  Andreas Dilger  <adilger@clusterfs.com>
+
+	* build-rpm: use rpmbuild if it is installed instead of rpm
+
 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.35
diff --git a/contrib/build-rpm b/contrib/build-rpm
index 4e5da7d..9eca504 100644
--- a/contrib/build-rpm
+++ b/contrib/build-rpm
@@ -23,6 +23,5 @@ cp -sR `pwd`/$currdir $tmpdir/$builddir || exit 1
 
 (cd $tmpdir && tar czfh ${builddir}.tar.gz $builddir)
 
-rpm --define "_sourcedir `pwd`/$tmpdir" -ba $currdir/e2fsprogs.spec || exit $?
-rm -rf $tmpdir
-
+[ "`rpmbuild --version 2> /dev/null`" ] && RPM=rpmbuild || RPM=rpm
+$RPM --define "_sourcedir `pwd`/$tmpdir" -ba $currdir/e2fsprogs.spec || exit $?