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>

diff --git a/.release-checklist b/.release-checklist
index 414265c45fd96c051a7d8dbc15a213336dcd88ad..c8a6fc2fc9c80ac2d51375526b38c1e762933b01 100644 (file)
--- 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 37b60692f68f9ef3935cfdfea07d335082ab6698..0d0745c13107eea40146a212a2f6104cba08825d 100644 (file)
--- 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 
 

diff --git a/configure b/configure
index 9d76f1c5d8ed87e6aaea2f2f359d51b5b1f3f579..a18b631416418aef6a51af2f18279f9dffc62082 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 158e41ec81423319e59039bb31a4fac3ca335fcf..81173d000481a8d2e110f97cf5d3760d8d5ff98d 100644 (file)
--- 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
similarity index 99%
rename from e2fsprogs.spec.in
rename to e2fsprogs.spec
index f42c4be68eb0114a7c91143392178add23ea6278..2828ab47b0eb7b56423b4f4ddfde809c0df8b989 100644 (file)
--- 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 e87f287adfd22a1ddcf306fd8232ef51fcd4c244..763b0f5a03ee3f274c14d3873d89426c81305a52 100644 (file)
--- 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