diff options
| author | Andreas Dilger <adilger@clusterfs.com> | 2006-11-12 19:41:25 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2006-11-12 19:41:25 -0500 |
| commit | 927566a3abfdb576c53b42898affb78333e7299a (patch) | |
| tree | b6c6dcf98b54c79a1a6980163a84d92659d53ef4 /contrib | |
| parent | 98224fbc1db8387da1fe0fd1bb3be25c18be2e98 (diff) | |
| download | android_external_e2fsprogs-927566a3abfdb576c53b42898affb78333e7299a.tar.gz android_external_e2fsprogs-927566a3abfdb576c53b42898affb78333e7299a.tar.bz2 android_external_e2fsprogs-927566a3abfdb576c53b42898affb78333e7299a.zip | |
Fixes for building RPM's via "make rpm"
Fixed version number generation so that the same common
algorithm is used for Debian and RPM version numbering schemes.
This allows the RPM spec file to do the right thing for WIP releases.
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/build-rpm | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 905f2d7d..31890b19 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2006-11-12 Theodore Tso <tytso@mit.edu> + + * build-rpm: Ignore the quilt working directory, and clean up the + tmp directory afterwards. + 2006-06-30 Theodore Ts'o <tytso@mit.edu> * Release of E2fsprogs 1.38 diff --git a/contrib/build-rpm b/contrib/build-rpm index 95966849..c635097f 100644 --- a/contrib/build-rpm +++ b/contrib/build-rpm @@ -21,8 +21,14 @@ cp -sR `pwd`/$currdir $tmpdir/$builddir || exit 1 # Remove any build files from the temporary tarball directory [ -f $tmpdir/$builddir/Makefile ] && make -C $tmpdir/$builddir distclean -EXCLUDE="--exclude .hg*" +EXCLUDE="--exclude .hg* --exclude .pc*" (cd $tmpdir && tar czfh ${builddir}.tar.gz $EXCLUDE $builddir) [ "`rpmbuild --version 2> /dev/null`" ] && RPM=rpmbuild || RPM=rpm -$RPM --define "_sourcedir `pwd`/$tmpdir" -ba $currdir/e2fsprogs.spec || exit $? +$RPM --define "_sourcedir `pwd`/$tmpdir" -ba $currdir/e2fsprogs.spec + +ret=$? +rm -rf $tmpdir +exit $? + + |