packages: e2fsprogs/e2fsprogs-diet.patch, e2fsprogs/e2fsprogs.spec - downgr...

[gotar]

Author: gotar                        Date: Wed Mar 24 19:07:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- downgraded back to 1.41.9: dietlibc doesn't have *int64_t datatypes, rel. 2

---- Files affected:
packages/e2fsprogs:
   e2fsprogs-diet.patch (1.7 -> 1.8) , e2fsprogs.spec (1.229 -> 1.230) 

---- Diffs:

================================================================
Index: packages/e2fsprogs/e2fsprogs-diet.patch
diff -u packages/e2fsprogs/e2fsprogs-diet.patch:1.7 packages/e2fsprogs/e2fsprogs-diet.patch:1.8
--- packages/e2fsprogs/e2fsprogs-diet.patch:1.7	Wed Mar 24 18:41:40 2010
+++ packages/e2fsprogs/e2fsprogs-diet.patch	Wed Mar 24 20:07:31 2010
@@ -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
-@@ -817,7 +817,7 @@
-   AC_SEARCH_LIBS([blkid_probe_all], [blkid])
- fi
+@@ -701,7 +701,7 @@
+ 	[#include <sys/types.h>
+ 	 #include <sys/socket.h>])
  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 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)
+-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)
  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,5 +23,3 @@
  
  	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

================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.229 packages/e2fsprogs/e2fsprogs.spec:1.230
--- packages/e2fsprogs/e2fsprogs.spec:1.229	Wed Mar 24 18:45:48 2010
+++ packages/e2fsprogs/e2fsprogs.spec	Wed Mar 24 20:07:31 2010
@@ -36,12 +36,12 @@
 Summary(zh_CN.UTF-8):	管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
-Version:	1.41.11
-Release:	1
+Version:	1.41.9
+Release:	2
 License:	GPL v2 (with LGPL v2 and BSD parts)
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5:	fb507a40c2706bc38306f150d069e345
+# Source0-md5:	52f60a9e19a02f142f5546f1b5681927
 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
@@ -568,9 +568,9 @@
 %configure \
 	ac_cv_lib_dl_dlopen=no \
 	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-	%{?with_dietlibc:CC="diet %{__cc}"} \
-	CFLAGS="%{rpmcflags} -Os" \
-	LDFLAGS="%{rpmldflags} -static" \
+	%{?with_dietlibc:--with-cc="diet %{__cc}"} \
+	--with-ccopts="%{rpmcflags} -Os" \
+	--with-ldopts="%{rpmldflags} -static" \
 	--disable-elf-shlibs \
 	--disable-fsck \
 	--disable-libblkid \
@@ -580,7 +580,6 @@
 	--disable-e2initrd-helper \
 	--disable-uuidd \
 	--disable-tls \
-	--disable-nls \
 	--disable-threads
 
 %{__make} -j1 libs
@@ -918,6 +917,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.230  2010/03/24 19:07:31  gotar
+- downgraded back to 1.41.9: dietlibc doesn't have *int64_t datatypes, rel. 2
+
 Revision 1.229  2010/03/24 17:45:48  gotar
 - use CFLAGS/LDFLAGS instead old --with-*opts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs-diet.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs.spec?r1=1.229&r2=1.230&f=u