From a9998585d5bc1f2df9a3e1c2ce686c34a40c3617 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 4 May 2004 22:19:07 -0400 Subject: [PATCH] Use rpmbuild if it is installed instead of rpm --- contrib/ChangeLog | 4 ++++ contrib/build-rpm | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 + + * build-rpm: use rpmbuild if it is installed instead of rpm + 2004-02-28 Theodore Ts'o * 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 $? -- 1.8.3.1