OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=12

README.SUSE

@@ -0,0 +1,9 @@
+Since the e2fsprogs libraries has been split out into own packages,
+each having its own devel package
+libext2fs-devel
+libblkid-devel
+libuuid-devel
+libcom_err-devel
+the e2fsprogs-devel package is deprecated and is provided for temporary
+backwards compatibility only.
+

e2fsprogs-1.35-libdir.diff

@@ -1,14 +1,16 @@
---- configure.in
+Index: configure.in
+===================================================================
+--- configure.in.orig
 +++ configure.in
-@@ -553,6 +553,7 @@
+@@ -569,6 +569,7 @@ if test $cross_compiling = no; then
  else
    AC_CHECK_PROGS(BUILD_CC, gcc cc)
  fi
 +AC_HEADER_TIME
- AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h stdint.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disklabel.h sys/ioctl.h sys/mkdev.h sys/prctl.h sys/queue.h sys/sockio.h sys/socket.h sys/sysmacros.h sys/time.h sys/stat.h sys/types.h sys/wait.h sys/resource.h net/if_dl.h netinet/in.h)
+ AC_CHECK_HEADERS(stdlib.h unistd.h stdarg.h stdint.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disklabel.h sys/ioctl.h sys/mman.h sys/mkdev.h sys/prctl.h sys/queue.h sys/sockio.h sys/socket.h sys/sysmacros.h sys/time.h sys/stat.h sys/types.h sys/wait.h sys/resource.h net/if_dl.h netinet/in.h utime.h)
  AC_CHECK_HEADERS(sys/disk.h sys/mount.h,,,
  [[
-@@ -751,7 +752,7 @@
+@@ -778,7 +779,7 @@ if test "$root_prefix" = NONE ; then
  else
  	root_bindir='${root_prefix}/bin'
  	root_sbindir='${root_prefix}/sbin'

e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af96554d169704fd7338ad5f05d590b9af61d27357327c7cb3a6c3344648fc55
-size 3597330

e2fsprogs-1.40.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46d1fb8e2b6ed5f078923e6f659ff69b34db720a0a929d5864e3b9e535bcd0a3
+size 3718339

e2fsprogs-blkid_probe_ext4.patch

@@ -1,7 +1,7 @@
-Index: e2fsprogs-1.39+1.40_WIP_20061114/lib/blkid/probe.c
+Index: e2fsprogs-1.40/lib/blkid/probe.c
 ===================================================================
---- e2fsprogs-1.39+1.40_WIP_20061114.orig/lib/blkid/probe.c
+--- e2fsprogs-1.40.orig/lib/blkid/probe.c
-+++ e2fsprogs-1.39+1.40_WIP_20061114/lib/blkid/probe.c
++++ e2fsprogs-1.40/lib/blkid/probe.c
 @@ -148,6 +148,39 @@ static void get_ext2_info(blkid_dev dev,
  	set_uuid(dev, es->s_uuid, 0);
  }
@@ -42,18 +42,18 @@ Index: e2fsprogs-1.39+1.40_WIP_20061114/lib/blkid/probe.c
  static int probe_ext3(struct blkid_probe *probe, 
  		      struct blkid_magic *id __BLKID_ATTR((unused)), 
  		      unsigned char *buf)
-@@ -710,6 +743,7 @@ static struct blkid_magic type_array[] =
+@@ -830,6 +863,7 @@ static struct blkid_magic type_array[] =
  /*  type     kboff   sboff len  magic			probe */
    { "oracleasm", 0,	32,  8, "ORCLDISK",		probe_oracleasm },
-   { "ntfs",      0,      3,  8, "NTFS    ",             0 },
+   { "ntfs",	 0,	 3,  8, "NTFS    ",		probe_ntfs },
 +  { "ext4dev",	 1,   0x38,  2, "\123\357",		probe_ext4 },
    { "jbd",	 1,   0x38,  2, "\123\357",		probe_jbd },
    { "ext3",	 1,   0x38,  2, "\123\357",		probe_ext3 },
    { "ext2",	 1,   0x38,  2, "\123\357",		probe_ext2 },
-Index: e2fsprogs-1.39+1.40_WIP_20061114/lib/blkid/probe.h
+Index: e2fsprogs-1.40/lib/blkid/probe.h
 ===================================================================
---- e2fsprogs-1.39+1.40_WIP_20061114.orig/lib/blkid/probe.h
+--- e2fsprogs-1.40.orig/lib/blkid/probe.h
-+++ e2fsprogs-1.39+1.40_WIP_20061114/lib/blkid/probe.h
++++ e2fsprogs-1.40/lib/blkid/probe.h
 @@ -87,6 +87,8 @@ struct ext2_super_block {
  #define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x00000004
  #define EXT3_FEATURE_INCOMPAT_RECOVER		0x00000004

e2fsprogs-codecleanup.diff

@@ -1,175 +0,0 @@
---- debugfs/debugfs.c
-+++ debugfs/debugfs.c
-@@ -42,6 +42,9 @@
- ext2_filsys	current_fs = NULL;
- ext2_ino_t	root, cwd;
- 
-+extern int debugfs_read_inode_full(ext2_ino_t, struct ext2_inode *,
-+								   const char *, int);
-+
- static void open_filesystem(char *device, int open_flags, blk_t superblock,
- 			    blk_t blocksize, int catastrophic, 
- 			    char *data_filename)
-@@ -377,10 +380,10 @@
- 	else
- 		fprintf(lb->f, ", ");
- 	if (lb->first_block == lb->last_block)
--		fprintf(lb->f, "(%lld):%u", lb->first_bcnt, lb->first_block);
-+		fprintf(lb->f, "(%lld):%u", lb->first_bcnt, (long long)lb->first_block);
- 	else
- 		fprintf(lb->f, "(%lld-%lld):%u-%u", lb->first_bcnt,
--			lb->last_bcnt, lb->first_block, lb->last_block);
-+			(long long)lb->last_bcnt, (long long)lb->first_block, lb->last_block);
- 	lb->first_block = 0;
- }
- 
-@@ -507,7 +510,7 @@
- 			     list_blocks_proc, (void *)&lb);
- 	finish_range(&lb);
- 	if (lb.total)
--		fprintf(f, "\n%sTOTAL: %lld\n", prefix, lb.total);
-+		fprintf(f, "\n%sTOTAL: %lld\n", prefix, (long long)lb.total);
- 	fprintf(f,"\n");
- }
- 
-@@ -538,7 +541,7 @@
- 		__u64 i_size = (inode->i_size |
- 				((unsigned long long)inode->i_size_high << 32));
- 
--		fprintf(out, "%lld\n", i_size);
-+		fprintf(out, "%lld\n", (long long)i_size);
- 	} else
- 		fprintf(out, "%d\n", inode->i_size);
- 	if (current_fs->super->s_creator_os == EXT2_OS_HURD)
---- debugfs/ls.c
-+++ debugfs/ls.c
-@@ -92,8 +92,8 @@
- 		if (LINUX_S_ISDIR(inode.i_mode))
- 			fprintf(ls->f, "%5d", inode.i_size);
- 		else
--			fprintf(ls->f, "%5lld", inode.i_size |
--				((__u64)inode.i_size_high << 32));
-+			fprintf(ls->f, "%5lld", (long long) (inode.i_size |
-+				((__u64)inode.i_size_high << 32)));
- 		fprintf (ls->f, " %s %s\n", datestr, name);
- 	} else {
- 		sprintf(tmp, "%c%u%c (%d) %s   ", lbr, dirent->inode, rbr,
---- debugfs/lsdel.c
-+++ debugfs/lsdel.c
-@@ -190,7 +190,7 @@
- 	for (i = 0; i < num_delarray; i++) {
- 		fprintf(out, "%6u %6d %6o %6llu %4d/%4d %s", delarray[i].ino,
- 		       delarray[i].uid, delarray[i].mode, delarray[i].size,
--		       delarray[i].free_blocks, delarray[i].num_blocks, 
-+		       (unsigned long long)delarray[i].free_blocks, delarray[i].num_blocks, 
- 		       time_to_string(delarray[i].dtime));
- 	}
- 	fprintf(out, "%d deleted inodes found.\n", num_delarray);
---- e2fsck/message.c
-+++ e2fsck/message.c
-@@ -263,7 +263,7 @@
- 			else
- 				printf("%u", inode->i_size);
- #else
--			printf("%llu", (inode->i_size | 
-+			printf("%llu", (unsigned long long)(inode->i_size | 
- 					((__u64) inode->i_size_high << 32)));
- #endif
- 		}
-@@ -376,7 +376,7 @@
- #ifdef EXT2_NO_64_TYPE
- 		printf("%d", ctx->blkcount);
- #else
--		printf("%lld", ctx->blkcount);
-+		printf("%lld", (long long)ctx->blkcount);
- #endif
- 		break;
- 	case 'c':
-@@ -401,7 +401,7 @@
- #ifdef EXT2_NO_64_TYPE
- 		printf("%u", ctx->num);
- #else
--		printf("%llu", ctx->num);
-+		printf("%llu", (unsigned long long)ctx->num);
- #endif
- 		break;
- 	case 'p':
-@@ -427,7 +427,7 @@
- #ifdef EXT2_NO_64_TYPE
- 		printf("0x%x", ctx->num);
- #else
--		printf("0x%llx", ctx->num);
-+		printf("0x%llx", (unsigned long long)ctx->num);
- #endif
- 		break;
- 	default:
---- e2fsck/pass1.c
-+++ e2fsck/pass1.c
-@@ -55,6 +55,9 @@
- #define _INLINE_ inline
- #endif
- 
-+extern void e2fsck_write_inode_full(e2fsck_t, unsigned long,
-+									struct ext2_inode *, int, const char *);
-+
- static int process_block(ext2_filsys fs, blk_t	*blocknr,
- 			 e2_blkcnt_t blockcnt, blk_t ref_blk, 
- 			 int ref_offset, void *priv_data);
---- lib/et/error_message.c
-+++ lib/et/error_message.c
-@@ -35,7 +35,6 @@
-     int offset;
-     struct et_list *et;
-     errcode_t table_num;
--    int started = 0;
-     char *cp;
- 
-     offset = (int) (code & ((1<<ERRCODE_RANGE)-1));
---- lib/ss/error.c
-+++ lib/ss/error.c
-@@ -19,11 +19,10 @@
- 
- #include <stdarg.h>
-   
--char * ss_name(sci_idx)
--    int sci_idx;
-+char * ss_name(int sci_idx)
- {
--    register char *ret_val;
--    register ss_data *infop;
-+    char *ret_val;
-+    ss_data *infop;
-     
-     infop = ss_info(sci_idx);
-     if (infop->current_request == (char const *)NULL) {
-@@ -36,8 +35,8 @@
- 	return(ret_val);
-     }
-     else {
--	register char *cp;
--	register char const *cp1;
-+	char *cp;
-+	char const *cp1;
- 	ret_val = malloc((unsigned)sizeof(char) * 
- 			 (strlen(infop->subsystem_name)+
- 			  strlen(infop->current_request)+
-@@ -59,7 +58,7 @@
- 
- void ss_error (int sci_idx, long code, const char * fmt, ...)
- {
--    register char *whoami;
-+    char *whoami;
-     va_list pvar;
- 
-     va_start (pvar, fmt);
---- resize/sim_progress.c
-+++ resize/sim_progress.c
-@@ -87,7 +87,7 @@
- 		return retval;
- 	memset(prog, 0, sizeof(struct ext2_sim_progress));
- 
--	retval = ext2fs_get_mem(strlen(label)+1, (void **) &prog->label);
-+	retval = ext2fs_get_mem(strlen(label)+1, &prog->label);
- 	if (retval) {
- 		free(prog);
- 		return retval;

e2fsprogs-no_cmd_hiding.patch

@@ -1,5 +1,7 @@
---- debugfs/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: debugfs/Makefile.in
-+++ debugfs/Makefile.in	2007-04-24 16:29:16.000000000 +0200
+===================================================================
+--- debugfs/Makefile.in.orig
++++ debugfs/Makefile.in
 @@ -30,34 +30,29 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(
  DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
  
@@ -51,8 +53,10 @@
  		echo "	STRIP $(root_sbindir)/$$i"; \
  		$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
  	done
---- doc/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: doc/Makefile.in
-+++ doc/Makefile.in	2007-04-24 16:29:16.000000000 +0200
+===================================================================
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
 @@ -19,26 +19,22 @@ HTML=texi2html
  all:: libext2fs.info libext2fs.dvi
  
@@ -86,8 +90,10 @@
  
  .PHONY: distclean
  distclean:: clean
---- e2fsck/Makefile.in	2007-04-24 16:22:40.000000000 +0200
+Index: e2fsck/Makefile.in
-+++ e2fsck/Makefile.in	2007-04-24 16:29:10.000000000 +0200
+===================================================================
+--- e2fsck/Makefile.in.orig
++++ e2fsck/Makefile.in
 @@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) 
  COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
  
@@ -231,8 +237,10 @@
  		echo "	STRIP $(root_sbindir)/$$i"; \
  		$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
  	done
---- intl/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: intl/Makefile.in
-+++ intl/Makefile.in	2007-04-24 16:29:15.000000000 +0200
+===================================================================
+--- intl/Makefile.in.orig
++++ intl/Makefile.in
 @@ -146,11 +146,9 @@ all-no-yes: libgnuintl.$la
  all-no-no:
  
@@ -335,8 +343,10 @@
  
  
  # GNU gettext needs not contain the file `VERSION' but contains some
---- lib/blkid/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: lib/blkid/Makefile.in
-+++ lib/blkid/Makefile.in	2007-04-24 16:29:17.000000000 +0200
+===================================================================
+--- lib/blkid/Makefile.in.orig
++++ lib/blkid/Makefile.in
 @@ -1,4 +1,4 @@
 -# Makefile for libblkid
 +
@@ -492,8 +502,10 @@
  
  uninstall::
  	$(RM) -f $(DESTDIR)$(libdir)/libblkid.a \
---- lib/e2p/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: lib/e2p/Makefile.in
-+++ lib/e2p/Makefile.in	2007-04-24 16:29:22.000000000 +0200
+===================================================================
+--- lib/e2p/Makefile.in.orig
++++ lib/e2p/Makefile.in
 @@ -53,41 +53,35 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  @MAKEFILE_CHECKER@
  
@@ -549,8 +561,10 @@
  
  uninstall::
  	$(RM) -f $(DESTDIR)$(libdir)/libe2p.a \
---- lib/et/Makefile.in	2007-04-24 16:22:40.000000000 +0200
+Index: lib/et/Makefile.in
-+++ lib/et/Makefile.in	2007-04-24 16:29:23.000000000 +0200
+===================================================================
+--- lib/et/Makefile.in.orig
++++ lib/et/Makefile.in
 @@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  # what to build...
  #
@@ -634,9 +648,11 @@
  
  uninstall::
  	$(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \
---- lib/ext2fs/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: lib/ext2fs/Makefile.in
-+++ lib/ext2fs/Makefile.in	2007-04-24 16:29:24.000000000 +0200
+===================================================================
-@@ -161,72 +161,59 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
+--- lib/ext2fs/Makefile.in.orig
++++ lib/ext2fs/Makefile.in
+@@ -164,86 +164,70 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  all:: ext2fs.pc
  
  .c.o:
@@ -679,6 +695,13 @@
  		read_bb_file.o write_bb_file.o badblocks.o \
  		inline.o bitops.o gen_bitmap.o $(LIBCOM_ERR)
  
+ tst_icount: icount.c initialize.o  $(STATIC_LIBEXT2FS)
+-	@echo "	LD $@"
+-	@$(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
++	$(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
+ 		-DDEBUG $(ALL_CFLAGS) \
+ 		$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
+ 
  tst_iscan: tst_iscan.o inode.o badblocks.o test_io.o $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
 -	@$(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \
@@ -719,15 +742,25 @@
 -	@$(CC) -o tst_types tst_types.o 
 +	$(CC) -o tst_types tst_types.o 
  
+ tst_super_size: tst_super_size.o ext2_fs.h
+-	@echo "	LD $@"
+-	@$(CC) -o tst_super_size tst_super_size.o 
++	$(CC) -o tst_super_size tst_super_size.o 
+ 
+ ext2_tdbtool: tdbtool.o
+-	@echo "	LD $@"
+-	@$(CC) -o ext2_tdbtool tdbtool.o tdb.o
++	$(CC) -o ext2_tdbtool tdbtool.o tdb.o
+ 
  mkjournal: mkjournal.c $(STATIC_LIBEXT2FS)
 -	@echo "	LD $@"
 -	@$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
 +	$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
  
- check:: tst_bitops tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap tst_types
+ check:: tst_bitops tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap \
- 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops
+ 	tst_types tst_icount tst_super_size
-@@ -236,25 +223,22 @@ check:: tst_bitops tst_badblocks tst_isc
+@@ -256,25 +240,22 @@ check:: tst_bitops tst_badblocks tst_isc
- 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_types
+ 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size
  
  installdirs::
 -	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
@@ -759,8 +792,10 @@
  
  uninstall::
  	$(RM) -f $(DESTDIR)$(libdir)/libext2fs.a \
---- lib/ss/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: lib/ss/Makefile.in
-+++ lib/ss/Makefile.in	2007-04-24 16:29:21.000000000 +0200
+===================================================================
+--- lib/ss/Makefile.in.orig
++++ lib/ss/Makefile.in
 @@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
  XTRA_CFLAGS= -I$(srcdir)/../et
  
@@ -851,8 +886,10 @@
  
  uninstall::
  	$(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds \
---- lib/uuid/Makefile.in	2007-04-24 16:22:40.000000000 +0200
+Index: lib/uuid/Makefile.in
-+++ lib/uuid/Makefile.in	2007-04-24 16:29:24.000000000 +0200
+===================================================================
+--- lib/uuid/Makefile.in.orig
++++ lib/uuid/Makefile.in
 @@ -64,12 +64,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
  @MAKEFILE_CHECKER@
  
@@ -979,8 +1016,10 @@
  
  uninstall::
  	$(RM) -f $(DESTDIR)$(libdir)/libuuid.a \
---- Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: Makefile.in
-+++ Makefile.in	2007-04-24 16:29:29.000000000 +0200
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
 @@ -24,7 +24,7 @@ all:: subs
  	$(MAKE) docs
  
@@ -990,7 +1029,7 @@
  
  progs: subs all-progs-recursive
  libs: subs all-libs-recursive
-@@ -62,7 +62,7 @@ uninstall-libs: uninstall-libs-recursive
+@@ -65,7 +65,7 @@ uninstall-libs: uninstall-libs-recursive
  
  TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
    mostlyclean-recursive realclean-recursive:
@@ -999,7 +1038,7 @@
  	  if test -d $$subdir ; then \
  	    target=`echo $@|$(SED) 's/-recursive//'`; \
  	    echo making $$target in $$subdir; \
-@@ -72,7 +72,7 @@ TAGS clean-recursive distclean-recursive
+@@ -75,7 +75,7 @@ TAGS clean-recursive distclean-recursive
  
  all-progs-recursive install-progs-recursive install-strip-progs-recursive \
    uninstall-progs-recursive:
@@ -1008,7 +1047,7 @@
  	  if test -d $$subdir ; then \
  	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
  	    echo making $$target in $$subdir; \
-@@ -83,7 +83,7 @@ all-progs-recursive install-progs-recurs
+@@ -86,7 +86,7 @@ all-progs-recursive install-progs-recurs
  all-libs-recursive install-libs-recursive install-strip-libs-recursive \
    uninstall-libs-recursive install-shlibs-libs-recursive \
    install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive:
@@ -1017,8 +1056,10 @@
  	  if test -d $$subdir ; then \
  	    target=`echo $@|$(SED) 's/-libs-recursive//'`; \
  	    echo making $$target in $$subdir; \
---- misc/Makefile.in	2007-04-24 16:22:40.000000000 +0200
+Index: misc/Makefile.in
-+++ misc/Makefile.in	2007-04-24 16:29:28.000000000 +0200
+===================================================================
+--- misc/Makefile.in.orig
++++ misc/Makefile.in
 @@ -67,245 +67,200 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
  COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
  
@@ -1321,8 +1362,10 @@
  		echo "	STRIP $(sbindir)/$$i"; \
  		$(STRIP) $(DESTDIR)$(sbindir)/$$i; \
  	done
---- resize/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: resize/Makefile.in
-+++ resize/Makefile.in	2007-04-24 16:29:13.000000000 +0200
+===================================================================
+--- resize/Makefile.in.orig
++++ resize/Makefile.in
 @@ -34,39 +34,33 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L
  STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
  
@@ -1389,8 +1432,10 @@
  		echo "Test succeeded." ; \
  	else \
  		echo "Test failed!" ; \
---- tests/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: tests/Makefile.in
-+++ tests/Makefile.in	2007-04-24 16:29:13.000000000 +0200
+===================================================================
+--- tests/Makefile.in.orig
++++ tests/Makefile.in
 @@ -14,22 +14,14 @@ INSTALL = @INSTALL@
  all:: @DO_TEST_SUITE@
  
@@ -1450,8 +1495,10 @@
  
  clean::
  	$(RM) -f *~ *.log *.new *.failed *.ok test.img test_script
---- tests/progs/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: tests/progs/Makefile.in
-+++ tests/progs/Makefile.in	2007-04-24 16:29:12.000000000 +0200
+===================================================================
+--- tests/progs/Makefile.in.orig
++++ tests/progs/Makefile.in
 @@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR
  DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
  
@@ -1484,8 +1531,10 @@
  
  clean:
  	$(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \
---- util/Makefile.in	2007-03-29 06:32:23.000000000 +0200
+Index: util/Makefile.in
-+++ util/Makefile.in	2007-04-24 16:29:11.000000000 +0200
+===================================================================
+--- util/Makefile.in.orig
++++ util/Makefile.in
 @@ -14,25 +14,21 @@ SRCS = $(srcdir)/subst.c
  @MCONFIG@
  

e2fsprogs.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jul  4 19:02:51 CEST 2007 - mkoenig@suse.de
+
+- update to version 1.40
+- branch off libraries:
+  libblkid1
+  libuuid1
+  libext2fs2
+- renaming libcom_err to libcom_err2
+
 -------------------------------------------------------------------
 Tue Jun 19 11:06:52 CEST 2007 - mkoenig@suse.de
 

e2fsprogs.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package e2fsprogs (Version 1.39+1.40_WIP_20061114+PATCH20070329)
+# spec file for package e2fsprogs (Version 1.40)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -13,25 +13,25 @@
 Name:           e2fsprogs
 %define no_command_hiding 1
 BuildRequires:  libvolume_id-devel
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          System/Filesystems
 Provides:       e2fsbn ext2fs
 Supplements:    filesystem(ext2) filesystem(ext3)
 Obsoletes:      ext2fs
 PreReq:         %install_info_prereq
 Autoreqprov:    on
-Version:        1.39+1.40_WIP_20061114+PATCH20070329
+Version:        1.40
-Release:        23
+Release:        2
 Summary:        Utilities for the Second Extended File System
 URL:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
 Source1:        de.po
+Source2:        README.SUSE
 Patch0:         elf.diff
 Patch1:         %{name}-1.35-libdir.diff
 Patch2:         %{name}-1.33-fsckdevdisplay.diff
 Patch3:         %{name}-1.33-codecleanup.diff
 Patch4:         e2fsprogs-blkid.diff
-Patch5:         e2fsprogs-codecleanup.diff
 Patch6:         e2fsprogs-mdraid.patch
 Patch7:         e2fsprogs-probe_reiserfs-fpe.patch
 Patch8:         e2fsprogs-base_devt.patch
@@ -52,7 +52,8 @@ Patch31:        libcom_err-no-init_error_table.patch
 Patch32:        libcom_err-no-e2fsck.static.patch
 Patch33:        libcom_err-mutex.patch
 Patch34:        libcom_err-compile_et_permissions.patch
-Patch35:        e2fsprogs-no_cmd_hiding.patch
+# Do not suppress make commands
+Patch99:        e2fsprogs-no_cmd_hiding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -68,16 +69,13 @@ Authors:
     Theodore Ts'o <tytso@mit.edu>
 
 %package devel
-Summary:        Include Files and Libraries mandatory for Development.
+Summary:        Dummy development package
 Group:          Development/Libraries/C and C++
 Autoreqprov:    on
-Obsoletes:      ext2fs_d
+Requires:       libext2fs-devel = %version libblkid-devel = %version libuuid-devel = %version
-Provides:       ext2fs_d
-Requires:       e2fsprogs == %version libcom_err
 
 %description devel
-This package contains all necessary include files and libraries needed
+Dummy development package for backwards compatibility.
-to develop applications that require these.
 
 
 
@@ -86,17 +84,129 @@ Authors:
     Remy Card <card@masi.ibp.fr>
     Theodore Ts'o <tytso@mit.edu>
 
-%package -n libcom_err
+%package -n libext2fs2
-Summary:        com_err library
+Summary:        Ext2fs libray
-Group:          System/Libraries
+Group:          System/Filesystems
-Provides:       libcom_err-devel = %{version}
 Autoreqprov:    on
 
-%description -n libcom_err
+%description -n libext2fs2
+The basic Ext2fs library.
+
+
+
+Authors:
+--------
+    Remy Card <card@masi.ibp.fr>
+    Theodore Ts'o <tytso@mit.edu>
+
+%package -n libext2fs-devel
+Summary:        Development files for libext2fs
+Group:          System/Filesystems
+Autoreqprov:    on
+Requires:       libext2fs2 = %version libcom_err-devel
+
+%description -n libext2fs-devel
+Development files for libext2fs.
+
+
+
+Authors:
+--------
+    Remy Card <card@masi.ibp.fr>
+    Theodore Ts'o <tytso@mit.edu>
+
+%package -n libcom_err2
+Summary:        E2fsprogs error reporting library
+Group:          System/Filesystems
+Provides:       libcom_err = %{version}
+Obsoletes:      libcom_err < %{version}
+Autoreqprov:    on
+
+%description -n libcom_err2
 com_err is an error message display library.
 
 
 
+Authors:
+--------
+    Remy Card <card@masi.ibp.fr>
+    Theodore Ts'o <tytso@mit.edu>
+
+%package -n libcom_err-devel
+Summary:        Development files for libcom_err
+Group:          System/Filesystems
+Autoreqprov:    on
+Requires:       libcom_err2 = %version
+
+%description -n libcom_err-devel
+Development files for the com_err error message display library.
+
+
+
+Authors:
+--------
+    Remy Card <card@masi.ibp.fr>
+    Theodore Ts'o <tytso@mit.edu>
+
+%package -n libblkid1
+Summary:        Filesystem detection library
+Group:          System/Filesystems
+Autoreqprov:    on
+
+%description -n libblkid1
+Library for filesystem detection.
+
+
+
+Authors:
+--------
+    Remy Card <card@masi.ibp.fr>
+    Theodore Ts'o <tytso@mit.edu>
+
+%package -n libblkid-devel
+Summary:        Development files for the filesystem detection library
+Group:          System/Filesystems
+Autoreqprov:    on
+Requires:       libblkid1 = %version libuuid-devel
+
+%description -n libblkid-devel
+Files needed to develop applications using the library for filesystem
+detection.
+
+
+
+Authors:
+--------
+    Remy Card <card@masi.ibp.fr>
+    Theodore Ts'o <tytso@mit.edu>
+
+%package -n libuuid1
+Summary:        Library to generate UUIDs
+Group:          System/Filesystems
+Autoreqprov:    on
+
+%description -n libuuid1
+A library to generate universally unique IDs (UUIDs).
+
+
+
+Authors:
+--------
+    Remy Card <card@masi.ibp.fr>
+    Theodore Ts'o <tytso@mit.edu>
+
+%package -n libuuid-devel
+Summary:        Development files for libuuid1
+Group:          System/Filesystems
+Autoreqprov:    on
+Requires:       libuuid1 = %version
+
+%description -n libuuid-devel
+Files to develop applications using the library to generate universally
+unique IDs (UUIDs).
+
+
+
 Authors:
 --------
     Remy Card <card@masi.ibp.fr>
@@ -110,7 +220,6 @@ Authors:
 %patch2
 %patch3
 %patch4
-%patch5
 %patch6
 %patch7
 %patch8 -p1
@@ -131,9 +240,10 @@ Authors:
 %patch33 -p1
 %patch34 -p1
 %if no_command_hiding
-%patch35
+%patch99
 %endif
 cp %{S:1} po
+cp %{SOURCE2} .
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
@@ -164,6 +274,39 @@ rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/ldconfig
+%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
+
+%postun
+/sbin/ldconfig
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
+
+%post -n libext2fs2
+/sbin/ldconfig
+
+%postun -n libext2fs2
+/sbin/ldconfig
+
+%post -n libcom_err2
+/sbin/ldconfig
+
+%postun -n libcom_err2
+/sbin/ldconfig
+
+%post -n libblkid1
+/sbin/ldconfig
+
+%postun -n libblkid1
+/sbin/ldconfig
+
+%post -n libuuid1
+/sbin/ldconfig
+
+%postun -n libuuid1 
+/sbin/ldconfig
+# e2fsprogs
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc RELEASE-NOTES ChangeLog README doc/libblkid.txt
@@ -190,10 +333,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/uuidgen
 /usr/sbin/mklost+found
 /usr/sbin/filefrag
-/%{_lib}/libblkid.so.*
-/%{_lib}/libe2p.so.*
-/%{_lib}/libext2fs.so.*
-/%{_lib}/libuuid.so.*
 %{_infodir}/libext2fs.info.gz
 %{_mandir}/man1/chattr.1.gz
 %{_mandir}/man1/lsattr.1.gz
@@ -201,45 +340,67 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/e2fsck.conf.5.gz
 %{_mandir}/man5/mke2fs.conf.5.gz
 %{_mandir}/man8/*.8.gz
-
+# dummy devel package
-%post
-/sbin/ldconfig
-%install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
-
-%postun
-/sbin/ldconfig
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
 
 %files devel
+%defattr(-,root,root)
+%doc README.SUSE
+# libblkid
+
+%files -n libblkid1
+%defattr(-, root, root)
+/%{_lib}/libblkid.so.*
+
+%files -n libblkid-devel
 %defattr(-, root, root)
 %{_libdir}/libblkid.a
-%{_libdir}/libe2p.a
-%{_libdir}/libext2fs.a
-%{_libdir}/libuuid.a
 %{_libdir}/libblkid.so
-%{_libdir}/libe2p.so
-%{_libdir}/libext2fs.so
-%{_libdir}/libuuid.so
-/usr/include/e2p
-/usr/include/ext2fs
-/usr/include/uuid
 /usr/include/blkid
 %_libdir/pkgconfig/blkid.pc
+%{_mandir}/man3/libblkid.3.gz
+# libuuid
+
+%files -n libuuid1
+%defattr(-, root, root)
+/%{_lib}/libuuid.so.*
+
+%files -n libuuid-devel
+%defattr(-, root, root)
+%{_libdir}/libuuid.a
+%{_libdir}/libuuid.so
+/usr/include/uuid
+%_libdir/pkgconfig/uuid.pc
+%{_mandir}/man3/uuid*
+# libext2fs
+
+%files -n libext2fs2
+%defattr(-, root, root)
+/%{_lib}/libext2fs.so.*
+/%{_lib}/libe2p.so.*
+
+%files -n libext2fs-devel
+%defattr(-, root, root)
+%{_libdir}/libext2fs.so
+%{_libdir}/libext2fs.a
+%{_libdir}/libe2p.a
+%{_libdir}/libe2p.so
+/usr/include/ext2fs
+/usr/include/e2p
 %_libdir/pkgconfig/e2p.pc
 %_libdir/pkgconfig/ext2fs.pc
-%_libdir/pkgconfig/uuid.pc
+# libcom_err
-%{_mandir}/man3/*.3.gz
 
-%files -n libcom_err
+%files -n libcom_err2
 %defattr(-, root, root)
 /%{_lib}/libcom_err.so.*
 /%{_lib}/libss.so.*
 %_datadir/et
 %_datadir/ss
+
+%files -n libcom_err-devel
+%defattr(-, root, root)
 %_bindir/compile_et
 %_bindir/mk_cmds
-%{_mandir}/man1/compile_et.1.gz
-%{_mandir}/man1/mk_cmds.1.gz
 %{_libdir}/libcom_err.so
 %{_libdir}/libcom_err.a
 %{_libdir}/libss.a
@@ -248,12 +409,18 @@ rm -rf $RPM_BUILD_ROOT
 %_libdir/pkgconfig/ss.pc
 %_includedir/et
 %_includedir/ss
-
+%{_mandir}/man1/compile_et.1.gz
-%post -n libcom_err -p /sbin/ldconfig
+%{_mandir}/man1/mk_cmds.1.gz
-
+%{_mandir}/man3/com_err.3.gz
-%postun -n libcom_err -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 04 2007 - mkoenig@suse.de
+- update to version 1.40
+- branch off libraries:
+  libblkid1
+  libuuid1
+  libext2fs2
+- renaming libcom_err to libcom_err2
 * Tue Jun 19 2007 - mkoenig@suse.de
 - fix e2fsprogs-1.39-uuid_duplicates.patch [#189640]
   * detach shm segment after use