diff --git a/.gitattributes b/.gitattributes index 91b51e7..911ef20 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,5 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns +e2fsprogs-1.41.11.de.po filter=lfs diff=lfs merge=lfs -text e2fsprogs-1.41.4.de.po filter=lfs diff=lfs merge=lfs -text diff --git a/e2fsprogs-1.41.1-splash_support.patch b/e2fsprogs-1.41.1-splash_support.patch index fd51c97..7fb4331 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.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); diff --git a/e2fsprogs-1.41.11.de.po b/e2fsprogs-1.41.11.de.po new file mode 100644 index 0000000..8dfd667 --- /dev/null +++ b/e2fsprogs-1.41.11.de.po @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbd1a3ce2548c63d2f7c7dc60453c14bcead260f24de647ea894feccdf76ebba +size 152553 diff --git a/e2fsprogs.changes b/e2fsprogs.changes index f092aa3..f037465 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 395d47a..f306be8 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -37,7 +37,7 @@ 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 %{?jobs:-j%jobs} V=1 %install make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}