Makefile.in, ChangeLog:

  Change the name of the complete source file that we built (that
  includes resize2fs) to be e2fsprogs-ALL-<version>.tar.gz.  Don't link
  with libuuid, since it's not needed.
resize2fs.8.in:
  Add copyright statement.
Many files:
  Update packaging for the resize2fs program.

6 files changed, 74 insertions, 11 deletions

diff --git a/resize/ChangeLog b/resize/ChangeLog
index f32eef23..54ea5e23 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,5 +1,10 @@
 Sat Mar  7 18:18:04 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
+	* Makefile.in: Change the name of the complete source file that we
+	 	built (that includes resize2fs) to be
+	 	e2fsprogs-ALL-<version>.tar.gz.  Don't link with libuuid,
+	 	since it's not needed.
+
 	* main.c (main): Add copyright notice.
 
 	* resize2fs.c (blocks_to_move): Create the meta_bmap using the old
diff --git a/resize/Makefile.in b/resize/Makefile.in
index bab4f084..f4510c8a 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -25,11 +25,11 @@ SRCS= $(srcdir)/extent.c \
 	$(srcdir)/main.c \
 	$(srcdir)/sim_progress.c
 
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  $(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  $(LIBUUID)
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)  
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
 
-STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBUUID)
-STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBUUID)
+STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $< -o $@
@@ -105,15 +105,18 @@ $(top_srcdir)/.exclude-file:
 		| sed -e "s/e2fsprogs/$$a/" > $(top_srcdir)/.exclude-file
 	echo "$(SRCROOT)/build" >> $(top_srcdir)/.exclude-file
 	echo "$(SRCROOT)/rpm.log" >> $(top_srcdir)/.exclude-file
+	echo "$(SRCROOT)/powerquest" >> $(top_srcdir)/.exclude-file
 	echo "$(SRCROOT)/.exclude-file" >> $(top_srcdir)/.exclude-file
 	echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
 		>> $(top_srcdir)/.exclude-file
+	echo $(SRCROOT)/e2fsprogs-ALL-@E2FSPROGS_VERSION@.tar.gz \
+		>> $(top_srcdir)/.exclude-file
 	
 source_tar_file: $(top_srcdir)/.exclude-file
 	(cd $(top_srcdir)/..; a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
 		$(TAR) -c -h -v -f - \
 			-X $$a/.exclude-file $$a | \
-		gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz)
+		gzip -9 > e2fsprogs-ALL-@E2FSPROGS_VERSION@.tar.gz)
 	rm -f $(top_srcdir)/.exclude-file
 
 # +++ Dependency line eater +++
diff --git a/resize/e2fsprogs-1.11.spec b/resize/e2fsprogs-1.12.spec
index f1b99033..777de15f 100644
--- a/resize/e2fsprogs-1.11.spec
+++ b/resize/e2fsprogs-1.12.spec
@@ -1,10 +1,10 @@
 Summary: Tools for the second extended (ext2) filesystem 
 Name: e2fsprogs
-Version: 1.11
+Version: 1.12
 Release: 0
 Copyright: GPL
 Group: Utilities/System
-Source: tsx-11.mit.edu:/pub/linux/packages/ext2fs/e2fsprogs-1.11.tar.gz
+Source: ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/e2fsprogs-1.12.tar.gz
 BuildRoot: /tmp/e2fsprogs-root
 
 %description
@@ -14,6 +14,7 @@ and repairing ext2 filesystems.
 %package devel
 Summary: e2fs static libs and headers
 Group: Development/Libraries
+Requires: e2fsprogs
 
 %description devel 
 Libraries and header files needed to develop ext2 filesystem-specific
@@ -35,13 +36,14 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-elf-shlibs
 
 make libs progs docs
 
+rm -f resize/resize2fs
+mv resize/resize2fs.static resize/resize2fs
+
 %install
 export PATH=/sbin:$PATH
 make install DESTDIR="$RPM_BUILD_ROOT"
 make install-libs DESTDIR="$RPM_BUILD_ROOT"
 
-mv $RPM_BUILD_ROOT/usr/sbin/debugfs $RPM_BUILD_ROOT/sbin/debugfs
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %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/debugfs
 %attr(-, root, root) /sbin/mke2fs
@@ -65,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(-, root, root) /sbin/mkfs.ext2
 
 %attr(-, root, root) /lib/libe2p.so.2.3
-%attr(-, root, root) /lib/libext2fs.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.1
@@ -103,4 +106,3 @@ rm -rf $RPM_BUILD_ROOT
 %files -n resize2fs
 %attr(-, root, root) /usr/man/man8/resize2fs.8
 %attr(-, root, root) /usr/sbin/resize2fs
-
diff --git a/resize/pq.gif b/resize/pq.gif
new file mode 100644
index 00000000..9d95d44b
--- /dev/null
+++ b/resize/pq.gif
diff --git a/resize/resize2fs-1.12.spec b/resize/resize2fs-1.12.spec
new file mode 100644
index 00000000..3e12387a
--- /dev/null
+++ b/resize/resize2fs-1.12.spec
@@ -0,0 +1,44 @@
+Summary: ext2 filesystem resizer
+Name: resize2fs
+Version: 1.12
+Release: 0
+Vendor: PowerQuest
+Copyright: Licensed to Registered Users of Partition Magic(tm)
+Group: Utilities/System
+Requires: e2fsprogs
+Source: e2fsprogs-ALL-1.12.tar.gz
+Icon: pq.gif
+BuildRoot: /tmp/e2fsprogs-root
+
+%description
+This program will allow you to enlarge or shrink an ext2 filesystem.
+
+Resize2fs is Copyright 1998 by Theodore Ts'o and PowerQuest, Inc.  All
+rights reserved.  Resize2fs may not be redistributed without the prior
+consent of PowerQuest.  This version of resize2fs is available to licensed
+users of Partition Magic(tm).
+
+%prep
+%setup -n e2fsprogs-1.12
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure
+rm -rf e2fsck misc debugfs lib/ss lib/e2p lib/uuid tests
+
+make libs progs docs
+
+rm -f resize/resize2fs
+mv resize/resize2fs.static resize/resize2fs
+
+%install
+export PATH=/sbin:$PATH
+make install DESTDIR="$RPM_BUILD_ROOT"
+make install-libs DESTDIR="$RPM_BUILD_ROOT"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+
+%attr(-, root, root) /usr/man/man8/resize2fs.8
+%attr(-, root, root) /usr/sbin/resize2fs
diff --git a/resize/resize2fs.8.in b/resize/resize2fs.8.in
index 3e60ce5c..2b558c9b 100644
--- a/resize/resize2fs.8.in
+++ b/resize/resize2fs.8.in
@@ -92,6 +92,15 @@ time trials.
 .SH AUTHOR
 .B resize2fs
 was written by Theodore Ts'o <tytso@mit.edu>.
+.SH COPYRIGHT
+Resize2fs is Copyright 1998 by Theodore Ts'o and PowerQuest, Inc.  All
+rights reserved.  
+.B Resize2fs
+may not be redistributed without the prior
+consent of PowerQuest.  This version of 
+.B resize2fs
+is available to licensed
+users of Partition Magic(tm).
 .SH SEE ALSO
 .BR fdisk (8),
 .BR e2fsck (8),