diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2004-05-04 22:19:07 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2004-05-04 22:19:07 -0400 |
| commit | a9998585d5bc1f2df9a3e1c2ce686c34a40c3617 (patch) | |
| tree | 1dc8f633d6941385479408030abcf720d81b5370 /contrib | |
| parent | 36569f87db7f357812486b0d63fe4e788148b0b8 (diff) | |
| download | e2fsprogs-a9998585d5bc1f2df9a3e1c2ce686c34a40c3617.tar.gz | |
Use rpmbuild if it is installed instead of rpm
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/build-rpm | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index cad33556..43a51b92 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 4e5da7d1..9eca5042 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 $? |