Accepting request 44229 from filesystems

Copy from filesystems/e2fsprogs based on submit request 44229 from user coolo

OBS-URL: https://build.opensuse.org/request/show/44229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=56
This commit is contained in:
OBS User autobuild 2010-07-30 10:44:37 +00:00 committed by Git OBS Bridge
commit ef34724c94
4 changed files with 1296 additions and 1038 deletions

View File

@ -1,7 +1,7 @@
Index: e2fsprogs-1.41.7/e2fsck/splash.c
Index: e2fsck/splash.c
===================================================================
--- /dev/null
+++ e2fsprogs-1.41.7/e2fsck/splash.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ e2fsck/splash.c 2010-04-19 13:46:32.808011099 +0200
@@ -0,0 +1,100 @@
+/*
+ * add support for switching the splash screen on boot
@ -103,10 +103,10 @@ Index: e2fsprogs-1.41.7/e2fsck/splash.c
+ verbose = 1;
+}
+
Index: e2fsprogs-1.41.7/e2fsck/splash.h
Index: e2fsck/splash.h
===================================================================
--- /dev/null
+++ e2fsprogs-1.41.7/e2fsck/splash.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ e2fsck/splash.h 2010-04-19 13:46:32.824003188 +0200
@@ -0,0 +1,13 @@
+#ifndef _SPLASH_H
+#define _SPLASH_H
@ -121,11 +121,11 @@ Index: e2fsprogs-1.41.7/e2fsck/splash.h
+
+#endif /* _SPLASH_H */
+
Index: e2fsprogs-1.41.7/e2fsck/Makefile.in
Index: e2fsck/Makefile.in
===================================================================
--- 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
--- e2fsck/Makefile.in.orig 2010-02-23 05:40:50.000000000 +0100
+++ e2fsck/Makefile.in 2010-04-19 13:46:32.863915437 +0200
@@ -64,7 +64,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 \
dx_dirinfo.o ehandler.o problem.o message.o recovery.o region.o \
@ -134,7 +134,7 @@ Index: e2fsprogs-1.41.7/e2fsck/Makefile.in
PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \
profiled/super.o profiled/pass1.o profiled/pass1b.o \
@@ -101,6 +101,7 @@ SRCS= $(srcdir)/e2fsck.c \
@@ -102,6 +102,7 @@ SRCS= $(srcdir)/e2fsck.c \
$(srcdir)/rehash.c \
$(srcdir)/region.c \
$(srcdir)/profile.c \
@ -142,16 +142,16 @@ Index: e2fsprogs-1.41.7/e2fsck/Makefile.in
prof_err.c \
$(MTRACE_SRC)
@@ -475,3 +476,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e
@@ -452,3 +453,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.7/e2fsck/unix.c
Index: e2fsck/unix.c
===================================================================
--- e2fsprogs-1.41.7.orig/e2fsck/unix.c
+++ e2fsprogs-1.41.7/e2fsck/unix.c
--- e2fsck/unix.c.orig 2010-03-15 05:14:12.000000000 +0100
+++ e2fsck/unix.c 2010-04-19 13:46:32.899004459 +0200
@@ -53,6 +53,7 @@ extern int optind;
#include "e2p/e2p.h"
#include "e2fsck.h"
@ -160,7 +160,7 @@ Index: e2fsprogs-1.41.7/e2fsck/unix.c
#include "../version.h"
/* Command line options */
@@ -941,6 +942,7 @@ int main (int argc, char *argv[])
@@ -956,6 +957,7 @@ int main (int argc, char *argv[])
int sysval, sys_page_size = 4096;
__u32 features[3];
char *cp;
@ -168,7 +168,7 @@ Index: e2fsprogs-1.41.7/e2fsck/unix.c
clear_problem_context(&pctx);
#ifdef MTRACE
@@ -970,6 +972,7 @@ int main (int argc, char *argv[])
@@ -985,6 +987,7 @@ int main (int argc, char *argv[])
exit(FSCK_ERROR);
}
reserve_stdio_fds();
@ -176,7 +176,7 @@ Index: e2fsprogs-1.41.7/e2fsck/unix.c
init_resource_track(&ctx->global_rtrack, NULL);
if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
@@ -1284,6 +1287,7 @@ print_unsupp_features:
@@ -1304,6 +1307,7 @@ print_unsupp_features:
fatal_error(ctx, 0);
check_if_skip(ctx);
check_resize_inode(ctx);

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Jun 30 16:11:36 UTC 2010 - jengelh@medozas.de
- Do package libext2fs.a (BuildRequired for silo) on SPARC
-------------------------------------------------------------------
Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
- use %_smp_mflags
-------------------------------------------------------------------
Mon Apr 19 16:21:09 UTC 2010 - pth@novell.com
- Regenerate patch so that it applies without fuzz.
- Fix spec file.
-------------------------------------------------------------------
Mon Apr 19 16:10:38 UTC 2010 - pth@novell.com
- Bring german message catalog up-to-date.
-------------------------------------------------------------------
Thu Mar 18 10:53:13 UTC 2010 - jack@suse.cz

View File

@ -31,13 +31,13 @@ Obsoletes: e2fsprogs-64bit
%endif
#
Version: 1.41.11
Release: 1
Release: 4
Summary: Utilities for the Second Extended File System
Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2
Source2: README.SUSE
Source3: baselibs.conf
Source6: %{name}-1.41.4.de.po
Source6: %{name}-%{version}.de.po
#
# e2fsprogs patches
#
@ -121,7 +121,7 @@ Development files for the com_err error message display library.
%prep
%setup -q
# e2fsprogs patches
%patch7 -p1
%patch7
# libcom_err patches
%patch34 -p1
cp %{SOURCE2} .
@ -129,19 +129,15 @@ cp %{S:6} po/de.po
%build
autoreconf --force --install
./configure --prefix=%{_prefix} \
%{configure} \
--with-root-prefix='' \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--enable-elf-shlibs \
--disable-evms \
--disable-libblkid \
--disable-libuuid \
--disable-uuidd \
--disable-fsck \
CFLAGS="$RPM_OPT_FLAGS"
%{__make} %{?jobs:-j%jobs} V=1
make %{?_smp_mflags} V=1
%install
make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}
@ -151,7 +147,11 @@ 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*
%ifarch %sparc
rm -v %{buildroot}%{_libdir}/lib{com,e2p,ss}*.a
%else
rm -v %{buildroot}%{_libdir}/*.a
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@ -217,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
%files -n libext2fs-devel
%defattr(-, root, root)
%{_libdir}/libext2fs.so
%ifarch %sparc
%{_libdir}/libext2fs.a
%endif
%{_libdir}/libe2p.so
/usr/include/ext2fs
/usr/include/e2p