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>
This commit is contained in:
Theodore Ts'o 2018-08-18 10:42:44 -04:00
parent ef9186ea43
commit e5f0f3eebe
6 changed files with 6 additions and 11 deletions

View File

@ -11,6 +11,7 @@
README
RELEASE-NOTES
e2fsprogs.lsm
e2fsprogs.spec
doc/libext2fs.texinfo (three places)
6) Make source distribution

View File

@ -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

2
configure vendored
View File

@ -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 \

View File

@ -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 \

View File

@ -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

View File

@ -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