* Mon Oct 03 2008 Eric Sandeen <sandeen@redhat.com> 1.41.3-2e2fsprogs-1_41_3-1_fc10F-10-start

- New upstream version (very minor fixes, ext4-related)

4 files changed, 7 insertions, 38 deletions

diff --git a/.cvsignore b/.cvsignore
index 50f8f41..38b80b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-e2fsprogs-1.41.2.tar.gz
+e2fsprogs-1.41.3.tar.gz
diff --git a/e2fsprogs-fix-blkid.patch b/e2fsprogs-fix-blkid.patch
deleted file mode 100644
index 4780757..0000000
--- a/e2fsprogs-fix-blkid.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-If only ext4 is available (as a module or in /proc/filesystems)
-blkid wasn't properly testing for it, because the time checks
-were backwards and always failed.  This caused old ext4dev
-filesystems to fail to mount as ext4.  With this patch it works
-fine.
-
-Signed-off-by: Eric Sandeen <sandeen@redhat.com>
----
-
-Index: e2fsprogs/lib/blkid/probe.c
-===================================================================
---- e2fsprogs.orig/lib/blkid/probe.c	2008-09-12 10:37:52.000000000 -0500
-+++ e2fsprogs/lib/blkid/probe.c	2008-10-08 13:28:42.218001472 -0500
-@@ -243,7 +243,7 @@ static int system_supports_ext4(void)
- 	static int	ret = -1;
- 	time_t		now = time(0);
- 
--	if (ret != -1 || (last_check - now) < 5)
-+	if (ret != -1 || (now - last_check) < 5)
- 		return ret;
- 	last_check = now;
- 	ret = (fs_proc_check("ext4") || check_for_modules("ext4"));
-@@ -256,7 +256,7 @@ static int system_supports_ext4dev(void)
- 	static int	ret = -1;
- 	time_t		now = time(0);
- 
--	if (ret != -1 || (last_check - now) < 5)
-+	if (ret != -1 || (now - last_check) < 5)
- 		return ret;
- 	last_check = now;
- 	ret = (fs_proc_check("ext4dev") || check_for_modules("ext4dev"));
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 43ad2c7..86b2fc2 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -3,8 +3,8 @@
 
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
-Version: 1.41.2
-Release: 2%{?dist}
+Version: 1.41.3
+Release: 1%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -16,7 +16,6 @@ Source3: uuidd.init
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch3: e2fsprogs-journal-move.patch
-Patch4: e2fsprogs-fix-blkid.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,8 +94,6 @@ SMP systems.
 %patch2 -p1 -b .featurecheck
 # Only change the journal placement for ext4, for now.
 %patch3 -p1 -b .journalmove
-# Fix blkid to recognize ext4dev as mountable by ext4
-%patch4 -p1 -b .blkid
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -295,6 +292,9 @@ fi
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Mon Oct 03 2008 Eric Sandeen <sandeen@redhat.com> 1.41.3-2
+- New upstream version (very minor fixes, ext4-related)
+
 * Thu Oct 02 2008 Eric Sandeen <sandeen@redhat.com> 1.41.2-2
 - Fix blkid to recognize ext4dev filesystems as ext4-mountable
 
diff --git a/sources b/sources
index efd9edb..78098f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c1c5177aea9a23b45b9b3f5b3241819  e2fsprogs-1.41.2.tar.gz
+b21d26fc46c584021dc9c444933ee1c2  e2fsprogs-1.41.3.tar.gz