- upgraded to 1.41.11

- R: libs >= 1.41.7 (ext2fs_get_rec_len symbol)

Changed files:
    e2fsprogs-diet.patch -> 1.7
    e2fsprogs.spec -> 1.228

diff --git a/e2fsprogs-diet.patch b/e2fsprogs-diet.patch
index f32c967603d344b28992f58f37280c8452f6a731..61e6548ca469e8de11088651008a5cbba4665cdd 100644 (file)
--- a/e2fsprogs-diet.patch
+++ b/e2fsprogs-diet.patch
@@ -1,12 +1,12 @@
 diff -ur e2fsprogs-1.41.3/configure.in e2fsprogs-1.41.3-diet/configure.in
 --- e2fsprogs-1.41.3/configure.in      2009-03-17 22:03:38.000000000 +0100
 +++ e2fsprogs-1.41.3-diet/configure.in 2009-03-17 22:01:22.000000000 +0100
-@@ -701,7 +701,7 @@
-       [#include <sys/types.h>
-        #include <sys/socket.h>])
+@@ -817,7 +817,7 @@
+   AC_SEARCH_LIBS([blkid_probe_all], [blkid])
+ fi
  dnl
--AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit)
-+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 stat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit)
+-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology)
++AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 stat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology)
  dnl
  dnl Check to see if -lsocket is required (solaris) to make something
  dnl that uses socket() to compile; this is needed for the UUID library
@@ -23,3 +23,5 @@ diff -ur e2fsprogs-1.41.3/misc/util.c e2fsprogs-1.41.3-diet/misc/util.c
  
        val = stat64(device, &s);
 
+--- configure.in.orig  2010-03-24 18:30:54.000000000 +0100
++++ configure.in       2010-03-24 18:36:46.000000000 +0100

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index d383527564803aeae564b994fcac2af3f504074b..17c82f56ffc8d55e59c5499bf519dae5ba13f46f 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -35,12 +35,12 @@ Summary(uk.UTF-8):  Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):  管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):  用於管理 ext2 檔案系統的工具程式。
 Name:          e2fsprogs
-Version:       1.41.9
+Version:       1.41.11
 Release:       1
 License:       GPL v2 (with LGPL v2 and BSD parts)
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 52f60a9e19a02f142f5546f1b5681927
+# Source0-md5: fb507a40c2706bc38306f150d069e345
 Source1:       e2compr-0.4.texinfo.gz
 # Source1-md5: c3c59ff37e49d8759abb1ef95a8d3abf
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -78,6 +78,7 @@ BuildRequires:        glibc-static
        %endif
 %endif
 Requires(post,postun): /sbin/ldconfig
+Requires:      %{name}-libs >= 1.41.7
 Requires:      fsck
 Requires:      libcom_err = %{version}-%{release}
 Obsoletes:     e2fsprogs-evms
@@ -566,7 +567,7 @@ sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \
 %configure \
        ac_cv_lib_dl_dlopen=no \
        %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-       %{?with_dietlibc:--with-cc="diet %{__cc}"} \
+       %{?with_dietlibc:CC="diet %{__cc}"} \
        --with-ccopts="%{rpmcflags} -Os" \
        --with-ldopts="%{rpmldflags} -static" \
        --disable-elf-shlibs \