diff --git a/baselibs.conf b/baselibs.conf index d370a65..84d6cfd 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,9 +1,6 @@ libext2fs2 libcom_err2 obsoletes "libcom_err- <= " -libblkid1 - obsoletes "e2fsprogs- <= " -libuuid1 e2fsprogs e2fsprogs-devel libext2fs-devel @@ -12,9 +9,3 @@ libext2fs-devel libcom_err-devel requires -libcom_err- requires "libcom_err2- = " -libblkid-devel - requires -libblkid- - requires "libblkid1- = " -libuuid-devel - requires -libuuid- - requires "libuuid1- = " diff --git a/e2fsprogs-1.41.1-splash_support.patch b/e2fsprogs-1.41.1-splash_support.patch index 4c8a3a8..fd51c97 100644 --- a/e2fsprogs-1.41.1-splash_support.patch +++ b/e2fsprogs-1.41.1-splash_support.patch @@ -1,7 +1,7 @@ -Index: e2fsprogs-1.41.1/e2fsck/splash.c +Index: e2fsprogs-1.41.7/e2fsck/splash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsprogs-1.41.1/e2fsck/splash.c 2008-12-04 17:51:32.000000000 +0100 +--- /dev/null ++++ e2fsprogs-1.41.7/e2fsck/splash.c @@ -0,0 +1,100 @@ +/* + * add support for switching the splash screen on boot @@ -103,10 +103,10 @@ Index: e2fsprogs-1.41.1/e2fsck/splash.c + verbose = 1; +} + -Index: e2fsprogs-1.41.1/e2fsck/splash.h +Index: e2fsprogs-1.41.7/e2fsck/splash.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ e2fsprogs-1.41.1/e2fsck/splash.h 2008-12-04 17:46:23.000000000 +0100 +--- /dev/null ++++ e2fsprogs-1.41.7/e2fsck/splash.h @@ -0,0 +1,13 @@ +#ifndef _SPLASH_H +#define _SPLASH_H @@ -121,10 +121,10 @@ Index: e2fsprogs-1.41.1/e2fsck/splash.h + +#endif /* _SPLASH_H */ + -Index: e2fsprogs-1.41.1/e2fsck/Makefile.in +Index: e2fsprogs-1.41.7/e2fsck/Makefile.in =================================================================== ---- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-12-04 17:46:23.000000000 +0100 -+++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-12-04 17:46:36.000000000 +0100 +--- e2fsprogs-1.41.7.orig/e2fsck/Makefile.in ++++ e2fsprogs-1.41.7/e2fsck/Makefile.in @@ -63,7 +63,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \ pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \ @@ -142,16 +142,16 @@ Index: e2fsprogs-1.41.1/e2fsck/Makefile.in prof_err.c \ $(MTRACE_SRC) -@@ -470,3 +471,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e +@@ -475,3 +476,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/profile.h prof_err.h prof_err.o: prof_err.c +splash.o: splash.c splash.h + -Index: e2fsprogs-1.41.1/e2fsck/unix.c +Index: e2fsprogs-1.41.7/e2fsck/unix.c =================================================================== ---- e2fsprogs-1.41.1.orig/e2fsck/unix.c 2008-09-01 17:34:28.000000000 +0200 -+++ e2fsprogs-1.41.1/e2fsck/unix.c 2008-12-04 17:46:36.000000000 +0100 +--- e2fsprogs-1.41.7.orig/e2fsck/unix.c ++++ e2fsprogs-1.41.7/e2fsck/unix.c @@ -53,6 +53,7 @@ extern int optind; #include "e2p/e2p.h" #include "e2fsck.h" @@ -160,7 +160,7 @@ Index: e2fsprogs-1.41.1/e2fsck/unix.c #include "../version.h" /* Command line options */ -@@ -895,6 +896,7 @@ int main (int argc, char *argv[]) +@@ -941,6 +942,7 @@ int main (int argc, char *argv[]) int sysval, sys_page_size = 4096; __u32 features[3]; char *cp; @@ -168,15 +168,15 @@ Index: e2fsprogs-1.41.1/e2fsck/unix.c clear_problem_context(&pctx); #ifdef MTRACE -@@ -924,6 +926,7 @@ int main (int argc, char *argv[]) +@@ -970,6 +972,7 @@ int main (int argc, char *argv[]) exit(FSCK_ERROR); } reserve_stdio_fds(); + splash_init(&sops); - #ifdef RESOURCE_TRACK init_resource_track(&ctx->global_rtrack, NULL); -@@ -1242,6 +1245,7 @@ print_unsupp_features: + if (!(ctx->options & E2F_OPT_PREEN) || show_version_only) +@@ -1284,6 +1287,7 @@ print_unsupp_features: fatal_error(ctx, 0); check_if_skip(ctx); check_resize_inode(ctx); diff --git a/e2fsprogs-1.41.7.tar.bz2 b/e2fsprogs-1.41.7.tar.bz2 deleted file mode 100644 index 46a8b31..0000000 --- a/e2fsprogs-1.41.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44c5ba76534f2fce84d11d04b850422ac8f2b6c1bdb2f33bab0462d9b81022fd -size 3893160 diff --git a/e2fsprogs-1.41.8.tar.bz2 b/e2fsprogs-1.41.8.tar.bz2 new file mode 100644 index 0000000..41fcb37 --- /dev/null +++ b/e2fsprogs-1.41.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1b063414cfde08a95d77cc9f2e03303e4b3a7d00c9b53dc1983a661b909c614 +size 3901984 diff --git a/e2fsprogs.changes b/e2fsprogs.changes index e214d35..8d83253 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Jul 13 16:12:09 CEST 2009 - coolo@novell.com + +- look for libreadline.so.6 too +- refresh patches to avoid fuzz + +------------------------------------------------------------------- +Mon Jul 13 12:36:55 CEST 2009 - kay.sievers@novell.com + +- update to 1.41.8 + - Fix resize2fs's online resizing, fixing a regression which in + e2fpsrogs 1.41.7. + - Fix resize2fs bugs when shrinking ext4 filesystems + - If the resize2fs operation fails, the user will be told to fix up + the filesystem using e2fsck -fy. + - do not install disabled uuid binary and man page + - Fix filefrag program for files that have more than 144 extents. + - allow V=1 to disable silent build +- enable verbose build again (V=1 merged upstream) +- move awk scripts from libcom_err2 to libcom_err2-devel + +------------------------------------------------------------------- +Wed Jul 8 18:03:02 CEST 2009 - meissner@suse.de + +- moved baselibs.conf changes to util-linux. + ------------------------------------------------------------------- Mon Jun 29 05:46:03 CEST 2009 - kay.sievers@novell.com diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 28d8fa0..40f43db 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,5 +1,5 @@ # -# spec file for package e2fsprogs (Version 1.41.7) +# spec file for package e2fsprogs (Version 1.41.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ AutoReqProv: on Obsoletes: e2fsprogs-64bit %endif # -Version: 1.41.7 +Version: 1.41.8 Release: 1 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net @@ -43,6 +43,7 @@ Source6: %{name}-1.41.4.de.po Patch7: e2fsprogs-1.41.1-splash_support.patch # libcom_err patches Patch34: libcom_err-compile_et_permissions.patch +Patch35: libcom_err-readline.patch # Do not suppress make commands BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,7 +74,7 @@ Group: System/Filesystems AutoReqProv: on %description -n libext2fs2 -The basic Ext2fs library. +The basic Ext2fs shared library. %package -n libext2fs-devel License: GPL v2 or later @@ -123,12 +124,12 @@ Development files for the com_err error message display library. %patch7 -p1 # libcom_err patches %patch34 -p1 +%patch35 -p1 cp %{SOURCE2} . cp %{S:6} po/de.po %build autoreconf --force --install -#autoconf ./configure --prefix=%{_prefix} \ --with-root-prefix='' \ --mandir=%{_mandir} \ @@ -141,7 +142,7 @@ autoreconf --force --install --disable-uuidd \ --disable-fsck \ CFLAGS="$RPM_OPT_FLAGS" -make +make V=1 %install make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib} @@ -149,10 +150,8 @@ make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib} rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4dev rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4dev -rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8 -rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8 -rm -f $RPM_BUILD_ROOT/usr/bin/uuidgen -rm -f $RPM_BUILD_ROOT/usr/share/man/man1/uuidgen.1 +rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8* +rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8* %clean rm -rf $RPM_BUILD_ROOT @@ -233,8 +232,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) /%{_lib}/libcom_err.so.* /%{_lib}/libss.so.* -%_datadir/et -%_datadir/ss %files -n libcom_err-devel %defattr(-, root, root) @@ -248,6 +245,8 @@ rm -rf $RPM_BUILD_ROOT %_libdir/pkgconfig/ss.pc %_includedir/et %_includedir/ss +%_datadir/et +%_datadir/ss %{_mandir}/man1/compile_et.1.gz %{_mandir}/man1/mk_cmds.1.gz %{_mandir}/man3/com_err.3.gz diff --git a/libcom_err-compile_et_permissions.patch b/libcom_err-compile_et_permissions.patch index ed749ee..528f303 100644 --- a/libcom_err-compile_et_permissions.patch +++ b/libcom_err-compile_et_permissions.patch @@ -1,7 +1,7 @@ -Index: e2fsprogs-1.39+1.40_WIP_20061114/lib/et/compile_et.sh.in +Index: e2fsprogs-1.41.7/lib/et/compile_et.sh.in =================================================================== ---- e2fsprogs-1.39+1.40_WIP_20061114.orig/lib/et/compile_et.sh.in -+++ e2fsprogs-1.39+1.40_WIP_20061114/lib/et/compile_et.sh.in +--- e2fsprogs-1.41.7.orig/lib/et/compile_et.sh.in ++++ e2fsprogs-1.41.7/lib/et/compile_et.sh.in @@ -51,7 +51,7 @@ if test -f ${BASE}.h && cmp -s ${BASE}.h rm -f ${BASE}.h.$$ else diff --git a/libcom_err-readline.patch b/libcom_err-readline.patch new file mode 100644 index 0000000..f4e7c6d --- /dev/null +++ b/libcom_err-readline.patch @@ -0,0 +1,13 @@ +Index: e2fsprogs-1.41.7/lib/ss/get_readline.c +=================================================================== +--- e2fsprogs-1.41.7.orig/lib/ss/get_readline.c ++++ e2fsprogs-1.41.7/lib/ss/get_readline.c +@@ -36,7 +36,7 @@ static void ss_release_readline(ss_data + } + + /* Libraries we will try to use for readline/editline functionality */ +-#define DEFAULT_LIBPATH "libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so" ++#define DEFAULT_LIBPATH "libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so" + + void ss_get_readline(int sci_idx) + {