Use rpmbuild if it is installed instead of rpm

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index cad33556f664434d0997aa85bf2056d48c6a770d..43a51b92f5fb671ebd5a136299935f9b62069770 100644 (file)
--- 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 4e5da7d1b375caa6da46104cd4bf8b65e10abed4..9eca50429c38c29db7c015a263f6afc65afa4a69 100644 (file)
--- 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 $?