From bef72f3d16caa710f403a031f4641b8d1749ff84 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 23 Jan 2007 00:14:43 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=4 --- e2fsprogs.changes | 6 ++++++ e2fsprogs.spec | 7 ++++++- libcom_err-compile_et_permissions.patch | 13 +++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 libcom_err-compile_et_permissions.patch diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 1022ac2..08e0ad3 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 22 17:16:53 CET 2007 - mkoenig@suse.de + +- don't chmod -w headers in compile_et to avoid build + problems with some packages + ------------------------------------------------------------------- Wed Jan 19 12:10:56 CET 2007 - mkoenig@suse.de diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 7eb396a..5b42b03 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -19,7 +19,7 @@ Obsoletes: ext2fs PreReq: %install_info_prereq Autoreqprov: on Version: 1.39+1.40_WIP_20061114 -Release: 1 +Release: 2 Summary: Utilities for the Second Extended File System URL: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -46,6 +46,7 @@ Patch30: libcom_err-no-static-buffer.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,6 +121,7 @@ Authors: %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 %build %{?suse_update_config:%{suse_update_config -f}} @@ -240,6 +242,9 @@ rm -rf $RPM_BUILD_ROOT %postun -n libcom_err -p /sbin/ldconfig %changelog -n e2fsprogs +* Mon Jan 22 2007 - mkoenig@suse.de +- don't chmod -w headers in compile_et to avoid build + problems with some packages * Fri Jan 19 2007 - mkoenig@suse.de - update to version 1.40-WIP-1114 (FATE#301897) * support for ext4 diff --git a/libcom_err-compile_et_permissions.patch b/libcom_err-compile_et_permissions.patch new file mode 100644 index 0000000..ed749ee --- /dev/null +++ b/libcom_err-compile_et_permissions.patch @@ -0,0 +1,13 @@ +Index: e2fsprogs-1.39+1.40_WIP_20061114/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 +@@ -51,7 +51,7 @@ if test -f ${BASE}.h && cmp -s ${BASE}.h + rm -f ${BASE}.h.$$ + else + mv -f ${BASE}.h.$$ ${BASE}.h +- chmod -w ${BASE}.h ++# chmod -w ${BASE}.h + fi + $AWK -f "${DIR}/et_c.awk" "outfile=${BASE}.c.$$" "outfn=${BASE}.c" "$ROOT.et" + if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then