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 /util/gen-tarball.in | |
| parent | 98224fbc1db8387da1fe0fd1bb3be25c18be2e98 (diff) | |
| download | e2fsprogs-927566a3abfdb576c53b42898affb78333e7299a.tar.gz | |
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 'util/gen-tarball.in')
| -rw-r--r-- | util/gen-tarball.in | 76 |
1 files changed, 4 insertions, 72 deletions
diff --git a/util/gen-tarball.in b/util/gen-tarball.in index b1593ceb..8365df14 100644 --- a/util/gen-tarball.in +++ b/util/gen-tarball.in @@ -9,84 +9,16 @@ base_ver=`echo @E2FSPROGS_VERSION@ | sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS base_e2fsprogs=`basename $top_dir` exclude=/tmp/exclude -case @E2FSPROGS_MONTH@ in - January) - mon=01 - ;; - February) - mon=02 - ;; - March) - mon=03 - ;; - April) - mon=04 - ;; - May) - mon=05 - ;; - June) - mon=06 - ;; - July) - mon=07 - ;; - August) - mon=08 - ;; - September) - mon=09 - ;; - October) - mon=10 - ;; - November) - mon=11 - ;; - December) - mon=12 - ;; -esac +deb_pkgver=`echo @E2FSPROGS_PKGVER@ | sed -e 's/_/-/g'` +echo Debian package $deb_pkgver case $1 in debian) - date_spec="@E2FSPROGS_YEAR@.$mon.@E2FSPROGS_DAY@" - case @E2FSPROGS_VERSION@ in - *-WIP|pre-*) - deb_vers=`echo $base_ver 0.01 - p | dc` - SRCROOT="e2fsprogs-$deb_vers+$base_ver-WIP-$date_spec+dfsg" - ;; - *-rc*) - deb_vers=`echo @E2FSPROGS_VERSION@ | sed -e 's/-rc/rc/'` - SRCROOT="e2fsprogs-$deb_vers+dfsg" - ;; - *-PLUS) - SRCROOT="e2fsprogs-$base_ver+$date_spec+dfsg" - ;; - *) - SRCROOT="e2fsprogs-$base_ver+dfsg" - ;; - esac + SRCROOT="e2fsprogs-$deb_pkgver+dfsg" list=debian ;; ubuntu) - date_spec="@E2FSPROGS_YEAR@.$mon.@E2FSPROGS_DAY@" - case @E2FSPROGS_VERSION@ in - *-WIP|pre-*) - deb_vers=`echo $base_ver 0.01 - p | dc` - SRCROOT="e2fsprogs-$deb_vers+$base_ver-WIP-$date_spec" - ;; - *-rc*) - deb_vers=`echo @E2FSPROGS_VERSION@ | sed -e 's/-rc/rc/'` - SRCROOT="e2fsprogs-$deb_vers" - ;; - *-PLUS) - SRCROOT="e2fsprogs-$base_ver+$date_spec" - ;; - *) - SRCROOT="e2fsprogs-$base_ver" - ;; - esac + SRCROOT="e2fsprogs-$deb_pkgver" list=all ;; subset) |