diff --git a/.gitignore b/.gitignore index d5148bd..677b2f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ e2fsprogs-1.41.12.tar.gz /e2fsprogs-1.41.13.tar.gz +/e2fsprogs-1.41.14.tar.gz diff --git a/e2fsprogs-1.41.13-big-endian.patch b/e2fsprogs-1.41.13-big-endian.patch deleted file mode 100644 index f314d3b..0000000 --- a/e2fsprogs-1.41.13-big-endian.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c -index 619bd2d..de7585c 100644 ---- a/lib/ext2fs/swapfs.c -+++ b/lib/ext2fs/swapfs.c -@@ -72,7 +72,7 @@ void ext2fs_swap_super(struct ext2_super_block * sb) - sb->s_flags = ext2fs_swab32(sb->s_flags); - sb->s_kbytes_written = ext2fs_swab64(sb->s_kbytes_written); - sb->s_snapshot_inum = ext2fs_swab32(sb->s_snapshot_inum); -- sb->s_snapshot_id = ext2fs_swab32(s_snapshot_id); -+ sb->s_snapshot_id = ext2fs_swab32(sb->s_snapshot_id); - sb->s_snapshot_r_blocks_count = - ext2fs_swab64(sb->s_snapshot_r_blocks_count); - sb->s_snapshot_list = ext2fs_swab32(sb->s_snapshot_list); diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 83ef653..6e70ecb 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -3,8 +3,8 @@ Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs -Version: 1.41.13 -Release: 2%{?dist} +Version: 1.41.14 +Release: 1%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -14,7 +14,6 @@ Source1: ext2_types-wrapper.h Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch Patch2: e2fsprogs-1.41.12-e4defrag.patch -Patch3: e2fsprogs-1.41.13-big-endian.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -151,8 +150,6 @@ It was originally inspired by the Multics SubSystem library. %patch1 -p1 -b .featurecheck # Enable e4defrag for testing %patch2 -p1 -b .e4defrag -# Update for big-endians (part of commit ccc7cf0328) -%patch3 -p1 -b .big-endian %build %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \ @@ -319,6 +316,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Thu Dec 23 2010 Eric Sandeen 1.41.14-1 +- New upstream release + * Wed Dec 22 2010 Dan HorĂ¡k 1.41.13-2 - Add upstream fix for big-endian machines diff --git a/sources b/sources index 5bfb971..e085006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7508a192c7a9471e2128424f4eafac1c e2fsprogs-1.41.13.tar.gz +05f70470aea2ef7efbb0845b2b116720 e2fsprogs-1.41.14.tar.gz