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

qboosh qboosh at pld-linux.org
Mon May 10 07:23:40 CEST 2010 

Author: qboosh                       Date: Mon May 10 05:23:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.41.11
- updated diet patch
- dropped external-{libuuid,libblkid} patches (system libs already handled by configure)

---- Files affected:
packages/e2fsprogs:
   e2fsprogs-diet.patch (1.8 -> 1.9) , e2fsprogs.spec (1.230 -> 1.231) , e2fsprogs-external-libblkid.patch (1.1 -> NONE)  (REMOVED), e2fsprogs-external-libuuid.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/e2fsprogs/e2fsprogs-diet.patch
diff -u packages/e2fsprogs/e2fsprogs-diet.patch:1.8 packages/e2fsprogs/e2fsprogs-diet.patch:1.9
--- packages/e2fsprogs/e2fsprogs-diet.patch:1.8	Wed Mar 24 20:07:31 2010
+++ packages/e2fsprogs/e2fsprogs-diet.patch	Mon May 10 07:23:34 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
-@@ -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,34 @@
  
  	val = stat64(device, &s);
 
+--- e2fsprogs-1.41.11/configure.in.orig	2010-05-09 13:54:54.850935070 +0200
++++ e2fsprogs-1.41.11/configure.in	2010-05-09 20:34:13.650932556 +0200
+@@ -405,7 +405,7 @@
+ 		[LIBUUID=`$PKG_CONFIG --libs uuid`;
+ 		 STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
+ 		[AC_MSG_ERROR([external uuid library not found])],
+-		[$LIBUUID])
++		[$LIBUUID_LIBADD])
+ 	UUID_CMT=#
+ 	AC_MSG_RESULT([Disabling private uuid library])
+ else
+@@ -456,7 +456,7 @@
+ 		[LIBBLKID=`$PKG_CONFIG --libs blkid`;
+ 		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
+ 		[AC_MSG_ERROR([external blkid library not found])],
+-		[$LIBBLKID])
++		[$LIBBLKID_LIBADD])
+ 	BLKID_CMT=#
+ 	AC_MSG_RESULT([Disabling private blkid library])
+ else
+--- e2fsprogs-1.41.11/misc/mke2fs.c.orig	2010-03-15 05:13:56.000000000 +0100
++++ e2fsprogs-1.41.11/misc/mke2fs.c	2010-05-09 20:44:41.178938422 +0200
+@@ -1927,7 +1927,7 @@
+ 	int ret;
+ 	int blocksize;
+ 	__u64 blocks;
+-	__uint64_t range[2];
++	uint64_t range[2];
+ 
+ 	blocks = fs->super->s_blocks_count;
+ 	blocksize = EXT2_BLOCK_SIZE(fs->super);

================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.230 packages/e2fsprogs/e2fsprogs.spec:1.231
--- packages/e2fsprogs/e2fsprogs.spec:1.230	Wed Mar 24 20:07:31 2010
+++ packages/e2fsprogs/e2fsprogs.spec	Mon May 10 07:23:34 2010
@@ -36,12 +36,12 @@
 Summary(zh_CN.UTF-8):	管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
-Version:	1.41.9
-Release:	2
+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:	http://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
+# 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
@@ -50,8 +50,6 @@
 Patch1:		e2compr-info.patch
 Patch2:		%{name}-498381.patch
 Patch3:		%{name}-diet.patch
-Patch4:		%{name}-external-libblkid.patch
-Patch5:		%{name}-external-libuuid.patch
 URL:		http://e2fsprogs.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -79,7 +77,7 @@
 	%endif
 %endif
 Requires(post,postun):	/sbin/ldconfig
-Requires:	%{name}-libs >= 1.41.7
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	fsck
 Requires:	libcom_err = %{version}-%{release}
 Obsoletes:	e2fsprogs-evms
@@ -544,8 +542,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 sed -i -e '/AC_SUBST(DO_TEST_SUITE/a\MKINSTALLDIRS="install -d"\nAC_SUBST(MKINSTALLDIRS)\n' configure.in
 
@@ -568,9 +564,11 @@
 %configure \
 	ac_cv_lib_dl_dlopen=no \
 	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-	%{?with_dietlibc:--with-cc="diet %{__cc}"} \
-	--with-ccopts="%{rpmcflags} -Os" \
-	--with-ldopts="%{rpmldflags} -static" \
+	%{?with_dietlibc:CC="diet %{__cc}"} \
+	CFLAGS="%{rpmcflags} -Os" \
+	LDFLAGS="%{rpmldflags} -static" \
+	LIBUUID_LIBADD="-lcompat" \
+	LIBBLKID_LIBADD="-luuid -lcompat" \
 	--disable-elf-shlibs \
 	--disable-fsck \
 	--disable-libblkid \
@@ -578,12 +576,14 @@
 	--disable-nls \
 	--disable-testio-debug \
 	--disable-e2initrd-helper \
-	--disable-uuidd \
+	--disable-threads \
 	--disable-tls \
-	--disable-threads
+	--disable-uuidd
 
-%{__make} -j1 libs
-%{__make} progs
+%{__make} -j1 libs \
+	V=1
+%{__make} progs \
+	V=1
 mv -f misc/mke2fs initrd-mke2fs
 %{__make} clean
 %{?with_dietlibc:mv MCONFIG.in.org MCONFIG.in}
@@ -591,20 +591,22 @@
 
 %configure \
 	--with-root-prefix="" \
-	%{!?with_nls:--disable-nls} \
-	%{!?with_allstatic:--enable-elf-shlibs} \
 	--disable-fsck \
 	--disable-libblkid \
 	--disable-libuuid \
+	%{!?with_nls:--disable-nls} \
+	--disable-rpath \
 	--disable-uuidd \
 	--enable-compression \
-	--enable-htree \
-	--disable-rpath
+	%{!?with_allstatic:--enable-elf-shlibs} \
+	--enable-htree
 
 %{__make} -j1 libs \
-	LDFLAGS="%{rpmldflags}"
+	LDFLAGS="%{rpmldflags}" \
+	V=1
 %{__make} progs docs \
-	LDFLAGS="%{rpmldflags}"
+	LDFLAGS="%{rpmldflags}" \
+	V=1
 
 cd doc
 makeinfo --no-split e2compr.texinfo
@@ -665,6 +667,12 @@
 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext3.8
 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4.8
 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4dev.8
+# moved to util-linux-ng.spec
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/uuidgen.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man3/libuuid.3
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man3/uuid_*.3
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/findfs.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/fsck.8
 
 %if %{with nls}
 [ "`file $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/e2fsprogs.mo |\
@@ -917,6 +925,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.231  2010/05/10 05:23:34  qboosh
+- updated to 1.41.11
+- updated diet patch
+- dropped external-{libuuid,libblkid} patches (system libs already handled by configure)
+
 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
 
================================================================

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

More information about the pld-cvs-commit mailing list