diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2018-08-18 10:42:44 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-08-18 11:06:23 -0400 |
| commit | e5f0f3eebef7b483d5cc8b37023d6e0256776d94 (patch) | |
| tree | 24a99d0b6036cc5be0e0eeb07da7cd89c0423d49 | |
| parent | ef9186ea438cabea872598f0b252c3df4dc683f9 (diff) | |
| download | e2fsprogs-e5f0f3eebef7b483d5cc8b37023d6e0256776d94.tar.gz | |
Stop generating e2fsprogs.spec automatically
It adds extra complexity for not much gain, and stands in the way of
generating the release tarfile via git archive.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | .release-checklist | 1 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | e2fsprogs.spec (renamed from e2fsprogs.spec.in) | 2 | ||||
| -rw-r--r-- | util/gen-tarball.in | 3 |
6 files changed, 6 insertions, 11 deletions
diff --git a/.release-checklist b/.release-checklist index 414265c4..c8a6fc2f 100644 --- a/.release-checklist +++ b/.release-checklist @@ -11,6 +11,7 @@ README RELEASE-NOTES e2fsprogs.lsm + e2fsprogs.spec doc/libext2fs.texinfo (three places) 6) Make source distribution diff --git a/Makefile.in b/Makefile.in index 37b60692..0d0745c1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,10 +40,7 @@ progs: all-progs-recursive libs: all-libs-recursive all-progs-recursive all-libs-recursive: subs -e2fsprogs.spec: $(DEP_SUBSTITUTE) e2fsprogs.spec.in - cd $(top_builddir); CONFIG_FILES=./e2fsprogs.spec ./config.status - -rpm: e2fsprogs.spec +rpm: sh contrib/build-rpm docs: @@ -117,7 +114,7 @@ clean:: clean-recursive clean-local clean-doc $(RM) -f $(SUBS) distclean: distclean-doc distclean-recursive - $(RM) -rf autom4te.cache e2fsprogs.spec ext2ed/Makefile po/stamp-po \ + $(RM) -rf autom4te.cache ext2ed/Makefile po/stamp-po \ asm_types.h config.log public_config.h parse-types.log $(MAKE) distclean-local @@ -13877,7 +13877,7 @@ if test -z "$BLKID_CMT" ; then blkid_out_list="lib/blkid/Makefile lib/blkid/blkid.pc \ lib/blkid/blkid_types.h" fi -for i in MCONFIG Makefile e2fsprogs.spec \ +for i in MCONFIG Makefile \ util/Makefile util/subst.conf util/gen-tarball util/install-symlink \ lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \ lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \ diff --git a/configure.ac b/configure.ac index 158e41ec..81173d00 100644 --- a/configure.ac +++ b/configure.ac @@ -1486,7 +1486,7 @@ if test -z "$BLKID_CMT" ; then blkid_out_list="lib/blkid/Makefile lib/blkid/blkid.pc \ lib/blkid/blkid_types.h" fi -for i in MCONFIG Makefile e2fsprogs.spec \ +for i in MCONFIG Makefile \ util/Makefile util/subst.conf util/gen-tarball util/install-symlink \ lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \ lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \ diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec index f42c4be6..2828ab47 100644 --- a/e2fsprogs.spec.in +++ b/e2fsprogs.spec @@ -5,7 +5,7 @@ Summary: Utilities for managing ext2/ext3/ext4 filesystems Name: e2fsprogs -Version: @E2FSPROGS_PKGVER@ +Version: 1.44.3 Release: 0 License: GPLv2 Group: System Environment/Base diff --git a/util/gen-tarball.in b/util/gen-tarball.in index e87f287a..763b0f5a 100644 --- a/util/gen-tarball.in +++ b/util/gen-tarball.in @@ -40,7 +40,6 @@ if test -z "$SOURCE_DATE_EPOCH" ; then export SOURCE_DATE_EPOCH=$(cd $top_srcdir; git log -1 --pretty=%ct) fi -mv ../e2fsprogs.spec $top_srcdir/e2fsprogs.spec (cd $top_srcdir/.. ; find $base_e2fsprogs \( -name \*~ -o -name \*.orig \ -o -name CVS -o -name \*.rej -o -name Makefile.pq \ -o -name TAGS -o -name \*.old -o -name SCCS \ @@ -56,5 +55,3 @@ sed -e "s;^;$base_e2fsprogs/;" < $srcdir/$list.exclude >> $exclude | $GZIP -9n -c > $tarout $GZIP -ln $tarout rm -f "$exclude" - -mv $top_srcdir/e2fsprogs.spec ../e2fsprogs.spec |