configure.in:

  Commit this file for future use; contains a configure.in script for when
  libuuid gets separtead out into its own package.
libext2fs.texinfo:
  Update version numbers for 1.19 release.
TODO:
  Commit TODO list for 1.19 release.
README:
  Update file for 1.19 release.
ChangeLog, e2fsprogs.spec:
  e2fsprogs.spec: Merge in a few changes from the Red Hat 6.2 spec file,
  	now that we're using a modern rpm to build e2fsprogs.  Also updated
  	version number to 1.19.
version.h:
  Update version number for 1.19 release.
ChangeLog:
  Check in changes for 1.19 release.

diff --git a/ChangeLog b/ChangeLog
index 5db63ec..cc1b29c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
+2000-07-13    <tytso@snap.thunk.org>
+
+       * e2fsprogs.spec: Merge in a few changes from the Red Hat 6.2 spec
+               file, now that we're using a modern rpm to build
+               e2fsprogs.  Also updated version number to 1.19.
+
 2000-07-07  Theodore Ts'o  <tytso@valinux.com>
 
        * e2fsprogs.spec (%post): Remove resize2fs from its old location

diff --git a/README b/README
index 367b3ab..e39f54f 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-       This is the new version (1.18) of the second extended file
+       This is the new version (1.19) of the second extended file
 system management programs.
 
        From time to time, I release new versions of e2fsprogs, to fix
@@ -6,16 +6,11 @@ bugs and to make the utilities more robust.  You can always find
 information about the latest version at the the e2fsprogs web page,
 which is:
 
-       http://web.mit.edu/tytso/www/linux/e2fsprogs.html
+       http://e2fsprogs.sourceforge.net
 
-       Note: If you are using the RedHat RPM distributions of
-e2fsprogs, don't worry about the next paragraph; all others, please
-read on!
-
-       See the file INSTALL for instructions on building and
-installing e2fsprogs.  This is important!  Note that your /etc/fstab
-file may need modifying before you install the new fsck program.  See
-the INSTALL file for more details.
+       Note: If you are NOT using the RedHat RPM distributions of
+e2fsprogs, and are building e2fsprogs from source, please see the file
+INSTALL for instructions on building and installing e2fsprogs.  
 
        In case of bugs in these programs, please contact Ted Ts'o at
 tytso@valinux.com or tytso@alum.mit.edu.  See the e2fsck man page for

diff --git a/TODO b/TODO
index 360a07e..cfa08d5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -196,3 +196,8 @@ TODO list.
                                                        - Ted
 
 ----------------------------------------------------------------
+
+check_if_mounted() should check to see if the file is in /proc/swaps,
+to avoid mkfs's or checking a active swap partition.
+
+----------------------------------------------------------------

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 713f3a2..dbceb75 100644 (file)
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-05  Theodore Ts'o  <tytso@valinux.com>
 
        * debugfs.c (dump_inode): Make the generation field be printed as

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 929176a..b5ac4a5 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 1999-11-10    <tytso@valinux.com>
 
        * Release of E2fsprogs 1.18

diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 79076ad..fe84d98 100644 (file)
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -1,7 +1,7 @@
 \input texinfo    @c -*-texinfo-*-
 @c %**start of header
 @setfilename libext2fs.info
-@settitle The EXT2FS Library (version 1.18)
+@settitle The EXT2FS Library (version 1.19)
 @synindex tp fn
 @comment %**end of header
 
@@ -60,8 +60,8 @@ by the author.
 
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
-@subtitle Version 1.18
-@subtitle November 1999
+@subtitle Version 1.19
+@subtitle July 2000
 
 @author by Theodore Ts'o
 
@@ -101,7 +101,7 @@ by the Foundation.
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.18.
+This manual documents the EXT2FS Library, version 1.19.
 
 @end ifinfo
 

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index a3e2d70..af145f9 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-06  Theodore Ts'o  <tytso@valinux.com>
 
        * unix.c (check_if_skip): Modify algorithm for checking

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 8357d1d..9c480f5 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -4,8 +4,9 @@ Version: 1.19
 Release: 0
 Copyright: GPL
 Group: System Environment/Base
-Source: ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/e2fsprogs-1.19.tar.gz
-BuildRoot: /tmp/e2fsprogs-root
+Buildroot: /var/tmp/%{name}-root
+Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-1.19.tar.gz
+Prereq: /sbin/ldconfig
 
 %description
 The e2fsprogs package contains a number of utilities for creating,
@@ -27,12 +28,12 @@ Summary: Ext2 filesystem-specific static libraries and headers.
 Group: Development/Libraries
 Requires: e2fsprogs
 
-%description devel 
+%description devel
 E2fsprogs-devel contains the libraries and header files needed to
 develop second extended (ext2) filesystem-specific programs.
 
 You should install e2fsprogs-devel if you want to develop ext2
-filesystem-specific programs.  If you install e2fsprogs-devel, you will
+filesystem-specific programs.  If you install e2fsprogs-devel, you'll
 also need to install e2fsprogs.
 
 %prep
@@ -44,9 +45,9 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-elf-shlibs
 make libs progs docs
 
 %install
+rm -rf $RPM_BUILD_ROOT
 export PATH=/sbin:$PATH
-make install DESTDIR="$RPM_BUILD_ROOT"
-make install-libs DESTDIR="$RPM_BUILD_ROOT"
+make install install-libs DESTDIR="$RPM_BUILD_ROOT"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,70 +57,83 @@ rm -rf $RPM_BUILD_ROOT
 # Remove possibly old version
 /bin/rm -f /usr/sbin/resize2fs
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post devel
+if [ -x /sbin/install-info ]; then
+   /sbin/install-info /usr/info/libext2fs.info.gz /usr/info/dir
+fi
+
+%postun devel
+if [ $1 = 0 -a -x /sbin/install-info ]; then
+   /sbin/install-info --delete /usr/info/libext2fs.info.gz /usr/info/dir
+fi
 
 %files
-%attr(-, root, root) %doc README RELEASE-NOTES
-%attr(-, root, root) /sbin/e2fsck
-%attr(-, root, root) /sbin/e2label
-%attr(-, root, root) /sbin/fsck.ext2
-%attr(-, root, root) /sbin/fsck.ext3
-%attr(-, root, root) /sbin/debugfs
-%attr(-, root, root) /sbin/mke2fs
-%attr(-, root, root) /sbin/badblocks
-%attr(-, root, root) /sbin/tune2fs
-%attr(-, root, root) /sbin/dumpe2fs
-%attr(-, root, root) /sbin/fsck
-%attr(-, root, root) /sbin/resize2fs
-%attr(-, root, root) /usr/sbin/mklost+found
-%attr(-, root, root) /sbin/mkfs.ext2
-
-%attr(-, root, root) /lib/libe2p.so.2.3
-%attr(-, root, root) /lib/libext2fs.so.2.4
-%attr(-, root, root) /lib/libss.so.2.0
-%attr(-, root, root) /lib/libcom_err.so.2.0
-%attr(-, root, root) /lib/libuuid.so.1.2
-
-%attr(-, root, root) /usr/bin/chattr
-%attr(-, root, root) /usr/bin/lsattr
-%attr(-, root, root) /usr/bin/uuidgen
-%attr(-, root, root) /usr/man/man8/e2fsck.8
-%attr(-, root, root) /usr/man/man8/e2label.8
-%attr(-, root, root) /usr/man/man8/debugfs.8
-%attr(-, root, root) /usr/man/man8/tune2fs.8
-%attr(-, root, root) /usr/man/man8/mklost+found.8
-%attr(-, root, root) /usr/man/man8/mke2fs.8
-%attr(-, root, root) /usr/man/man8/dumpe2fs.8
-%attr(-, root, root) /usr/man/man8/badblocks.8
-%attr(-, root, root) /usr/man/man8/fsck.8
-%attr(-, root, root) /usr/man/man8/resize2fs.8
-%attr(-, root, root) /usr/man/man1/chattr.1
-%attr(-, root, root) /usr/man/man1/lsattr.1
-%attr(-, root, root) /usr/man/man1/uuidgen.1
+%defattr(-,root,root)
+%doc README RELEASE-NOTES
+
+/sbin/badblocks
+/sbin/debugfs
+/sbin/dumpe2fs
+/sbin/e2fsck
+/sbin/e2label
+/sbin/fsck
+/sbin/fsck.ext2
+/sbin/fsck.ext3
+/sbin/mke2fs
+/sbin/mkfs.ext2
+/sbin/tune2fs
+/sbin/resize2fs
+/usr/sbin/mklost+found
+
+/lib/libcom_err.so.*
+/lib/libe2p.so.*
+/lib/libext2fs.so.*
+/lib/libss.so.*
+/lib/libuuid.so.*
+
+/usr/bin/chattr
+/usr/bin/lsattr
+/usr/bin/uuidgen
+/usr/man/man1/chattr.1*
+/usr/man/man1/lsattr.1*
+/usr/man/man1/uuidgen.1*
+
+/usr/man/man8/badblocks.8*
+/usr/man/man8/debugfs.8*
+/usr/man/man8/dumpe2fs.8*
+/usr/man/man8/e2fsck.8*
+/usr/man/man8/e2label.8*
+/usr/man/man8/fsck.8*
+/usr/man/man8/mke2fs.8*
+/usr/man/man8/mklost+found.8*
+/usr/man/man8/resize2fs.8*
+/usr/man/man8/tune2fs.8*
 
 %files devel
-%attr(-, root, root) /usr/info/libext2fs.info*
-%attr(-, root, root) /usr/lib/libe2p.a
-%attr(-, root, root) /usr/lib/libext2fs.a
-%attr(-, root, root) /usr/lib/libss.a
-%attr(-, root, root) /usr/lib/libcom_err.a
-%attr(-, root, root) /usr/lib/libuuid.a
-%attr(-, root, root) /usr/include/ss
-%attr(-, root, root) /usr/include/ext2fs
-%attr(-, root, root) /usr/include/et
-%attr(-, root, root) /usr/include/uuid
-%attr(-, root, root) /usr/lib/libe2p.so
-%attr(-, root, root) /usr/lib/libext2fs.so
-%attr(-, root, root) /usr/lib/libss.so
-%attr(-, root, root) /usr/lib/libcom_err.so
-%attr(-, root, root) /usr/lib/libuuid.so
-%attr(-, root, root) /usr/bin/mk_cmds
-%attr(-, root, root) /usr/bin/compile_et
-%attr(-, root, root) /usr/share/et/et_c.awk
-%attr(-, root, root) /usr/share/et/et_h.awk
-%attr(-, root, root) /usr/share/ss/ct_c.awk
-%attr(-, root, root) /usr/share/ss/ct_c.sed
-%attr(-, root, root) /usr/man/man1/compile_et.1
-%attr(-, root, root) /usr/man/man3/com_err.3
+%defattr(-,root,root)
+/usr/info/libext2fs.info*
+/usr/bin/compile_et
+/usr/bin/mk_cmds
+
+/usr/lib/libcom_err.a
+/usr/lib/libcom_err.so
+/usr/lib/libe2p.a
+/usr/lib/libe2p.so
+/usr/lib/libext2fs.a
+/usr/lib/libext2fs.so
+/usr/lib/libss.a
+/usr/lib/libss.so
+/usr/lib/libuuid.a
+/usr/lib/libuuid.so
+
+/usr/share/et
+/usr/share/ss
+/usr/include/et
+/usr/include/ext2fs
+/usr/include/ss
+/usr/include/uuid
+/usr/man/man1/compile_et.1*
+/usr/man/man3/com_err.3*
 

diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index 5c3e2f9..c4fd358 100644 (file)
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-07  Theodore Ts'o  <tytso@valinux.com>
 
        * ext2_fs.h: Update ext3 extension feature #define's.

diff --git a/include/nonunix/ChangeLog b/include/nonunix/ChangeLog
index 099ecf2..7599775 100644 (file)
--- a/include/nonunix/ChangeLog
+++ b/include/nonunix/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 1999-11-10    <tytso@valinux.com>
 
        * Release of E2fsprogs 1.18

diff --git a/install-utils/ChangeLog b/install-utils/ChangeLog
index 3038413..81474df 100644 (file)
--- a/install-utils/ChangeLog
+++ b/install-utils/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-04-02  Theodore Ts'o  <tytso@valinux.com>
 
        * Add e2label.8 to the remove_preformat_manpages script.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 12ece39..f162b29 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
 
        * intl/localealias.c (read_alias_file): Use unsigned char for

diff --git a/lib/ChangeLog b/lib/ChangeLog
index bca6ca5..57bfccb 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 1999-11-10    <tytso@valinux.com>
 
        * Release of E2fsprogs 1.18

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 485b4bc..0b920b5 100644 (file)
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-06  Theodore Ts'o  <tytso@valinux.com>
 
        * ls.c (list_super): Display the journal information fields in the

diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index cf4e32a..73df6f2 100644 (file)
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-04  Theodore Ts'o  <tytso@valinux.com>
 
        * Makefile.in: Remove explicit link of -lc in the shared library.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index f25d7e6..9a088dc 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-07  Theodore Ts'o  <tytso@valinux.com>
 
        * ext2fs.h (EXT2_LIB_FEATURE_INCOMPAT_SUPP): Add

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index f6f9e6a..7fcfdb4 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-04  Theodore Ts'o  <tytso@valinux.com>
 
        * Makefile.in: Remove explicit link of -lc in the shared library.

diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index f0e1450..988e626 100644 (file)
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-07  Theodore Ts'o  <tytso@valinux.com>
 
        * Makefile.in (uuid_time): Fix compilation rule so that

diff --git a/lib/uuid/configure.in b/lib/uuid/configure.in
new file mode 100644 (file)
index 0000000..bf9509f
--- /dev/null
+++ b/lib/uuid/configure.in
@@ -0,0 +1,10 @@
+dnl
+dnl  Not used now, for the future when uuid is separated out into its 
+dnl own package.
+dnl
+AC_INIT(gen_uuid.c)
+AC_PREREQ(2.12)
+
+AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
+AC_CHECK_FUNCS(srandom)
+AC_OUTPUT(Makefile)

diff --git a/misc/ChangeLog b/misc/ChangeLog
index b9170bd..4f9a728 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-13    <tytso@snap.thunk.org>
 
        * badblocks.8.in: Added text explaining that the -n and -w options

diff --git a/resize/ChangeLog b/resize/ChangeLog
index 6fff5db..6e974a4 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-05    <tytso@snap.thunk.org>
 
        * Makefile.in (install): Install resize2fs in /sbin, not /usr/sbin.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index c1ed44d..a6ef89d 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-05-25    <tytso@snap.thunk.org>
 
        * test_script.in: Ignore files in the test directory (to avoid

diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog
index 7757f92..cf8a8ec 100644 (file)
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-07-04    <tytso@snap.thunk.org>
 
        * Makefile.in: Use _SS_DIR_OVERRIDE to make sure we get the

diff --git a/util/ChangeLog b/util/ChangeLog
index 891b21f..6ac2653 100644 (file)
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13    <tytso@valinux.com>
+
+       * Release of E2fsprogs 1.19
+
 2000-04-03  Theodore Ts'o  <tytso@valinux.com>
 
        * subst.c: For platforms that don't define optarg.h, manually

diff --git a/version.h b/version.h
index 3658ca7..aa2ba7d 100644 (file)
--- a/version.h
+++ b/version.h
@@ -6,5 +6,5 @@
  * may be redistributed under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.19-WIP"
-#define E2FSPROGS_DATE "7-Jul-2000"
+#define E2FSPROGS_VERSION "1.19"
+#define E2FSPROGS_DATE "13-Jul-2000"