rpms/e2fsprogs/devel e2fsprogs-1.41-buildfix, NONE, 1.1 e2fsprogs-1.41-fix-mkswap-tests, NONE, 1.1 e2fsprogs.spec, 1.112, 1.113

Wed Jun 18 21:04:34 UTC 2008

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5276

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.41-buildfix e2fsprogs-1.41-fix-mkswap-tests 
Log Message:
* Tue Jun 18 2008 Eric Sandeen <sandeen at redhat.com> 1.41-0.WIP.0617
- New upstream snapshot release for ext4 capability



--- NEW FILE e2fsprogs-1.41-buildfix ---
Commit: 51d12cebb61ca00f5455fe6e25938cd79fea15ab in pu fails to build
"make check".

Signed-off-by: Jose R. Santos <jrs at us.ibm.com>
---

 e2fsck/Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 32743bc..0186112 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -143,12 +143,12 @@ tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
 tst_refcount: ea_refcount.c
 	@echo "	LD $@"
 	@$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
-		$(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+		$(ALL_CFLAGS) -DTEST_PROGRAM -L$(LIB) -lcom_err
 
 tst_region: region.c
 	@echo "	LD $@"
 	@$(CC) -o tst_region $(srcdir)/region.c \
-		$(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
+		$(ALL_CFLAGS) -DTEST_PROGRAM -L$(LIB) -lcom_err
 
 check:: tst_refcount tst_region tst_crc32
 	./tst_refcount


--- NEW FILE e2fsprogs-1.41-fix-mkswap-tests ---
Index: devel/e2fsprogs-1.41-WIP/lib/blkid/test_probe.in
===================================================================
--- e2fsprogs-1.41-WIP.orig/lib/blkid/test_probe.in	2008-06-16 12:08:45.000000000 -0500
+++ e2fsprogs-1.41-WIP/lib/blkid/test_probe.in	2008-06-16 14:56:33.437233901 -0500
@@ -20,10 +20,13 @@ do
 		continue
 	fi
 	bunzip2 < $SRCDIR/tests/$i.img.bz2 > tests/tmp/test.img.$$
-	# swap is native-endian, so regenerate before testing
 	if [ "$i" = "swap0" ]; then
+		# swap is native-endian, so regenerate before testing
+		dd if=/dev/zero of=tests/tmp/test.img.$$ bs=16k count=64
 		mkswap -v0 tests/tmp/test.img.$$ > /dev/null
 	elif [ "$i" = "swap1" ]; then
+		# swap is native-endian, so regenerate before testing
+		dd if=/dev/zero of=tests/tmp/test.img.$$ bs=16k count=64
 		mkswap -v1 -L SWAP-TEST -U 8ff8e77f-8553-485e-8656-58be67a81666 tests/tmp/test.img.$$ >/dev/null
 	fi
 	./tst_probe tests/tmp/test.img.$$ > tests/$i.out


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- e2fsprogs.spec	4 Jun 2008 18:00:53 -0000	1.112
+++ e2fsprogs.spec	18 Jun 2008 21:03:38 -0000	1.113
@@ -3,19 +3,20 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.40.10
-Release: 3%{?dist}
+Version: 1.41
+Release: 0.WIP.0617%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
 Group: System Environment/Base
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-WIP-0617.tar.gz
 Source1: ext2_types-wrapper.h
 Source2: blkid_types-wrapper.h
 Source3: uuidd.init
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch3: e2fsprogs-1.40.8-blkid-swap-tests.patch
+Patch3: e2fsprogs-1.41-buildfix
+Patch4: e2fsprogs-1.41-fix-mkswap-tests
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,8 +93,8 @@
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch2 -p1 -b .featurecheck
-# check a bit more in swapv1 headers before recognizing as swap
-%patch3 -p1 -b .swapchecks
+%patch3 -p1 -b .buildfix
+%patch4 -p1 -b .mkswap
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -178,14 +179,19 @@
 %{_root_sbindir}/e2fsck
 %{_root_sbindir}/e2image
 %{_root_sbindir}/e2label
+%{_root_sbindir}/e2undo
 %{_root_sbindir}/findfs
 %{_root_sbindir}/fsck
 %{_root_sbindir}/fsck.ext2
 %{_root_sbindir}/fsck.ext3
+%{_root_sbindir}/fsck.ext4
+%{_root_sbindir}/fsck.ext4dev
 %{_root_sbindir}/logsave
 %{_root_sbindir}/mke2fs
 %{_root_sbindir}/mkfs.ext2
 %{_root_sbindir}/mkfs.ext3
+%{_root_sbindir}/mkfs.ext4
+%{_root_sbindir}/mkfs.ext4dev
 %{_root_sbindir}/resize2fs
 %{_root_sbindir}/tune2fs
 %{_sbindir}/filefrag
@@ -210,13 +216,18 @@
 %{_mandir}/man8/filefrag.8*
 %{_mandir}/man8/fsck.ext2.8*
 %{_mandir}/man8/fsck.ext3.8*
+%{_mandir}/man8/fsck.ext4.8*
+%{_mandir}/man8/fsck.ext4dev.8*
 %{_mandir}/man8/e2image.8*
 %{_mandir}/man8/e2label.8*
+%{_mandir}/man8/e2undo.8*
 %{_mandir}/man8/fsck.8*
 %{_mandir}/man8/logsave.8*
 %{_mandir}/man8/mke2fs.8*
 %{_mandir}/man8/mkfs.ext2.8*
 %{_mandir}/man8/mkfs.ext3.8*
+%{_mandir}/man8/mkfs.ext4.8*
+%{_mandir}/man8/mkfs.ext4dev.8*
 %{_mandir}/man8/mklost+found.8*
 %{_mandir}/man8/resize2fs.8*
 %{_mandir}/man8/tune2fs.8*
@@ -282,6 +293,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Tue Jun 18 2008 Eric Sandeen <sandeen at redhat.com> 1.41-0.WIP.0617
+- New upstream snapshot release for ext4 capability
+
 * Wed Jun 04 2008 Eric Sandeen <sandeen at redhat.com> 1.40.10-3
 - Tidy up multilib hack for non-multilib arches (#446016)
 - Fix up %postun script (#449868)


