diff --git a/libguestfs.spec b/libguestfs.spec index d65bb2b..a40a83b 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.0.88 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -459,6 +459,8 @@ export LIBGUESTFS_DEBUG=1 # 563103 all F-13 glibc incorrect emulation of preadv/pwritev # (WORKAROUND using LD_PRELOAD) # 567567 32-bit all guestfish xstrtol test failure on 32-bit (FIXED) +# 575734 all F-14 microsecond resolution for blkid cache +# (FIXED upstream but still broken in F-14) # Workaround #563103 cat > rhbz563103.c <<'EOF' @@ -475,6 +477,13 @@ gcc -shared -Wl,-soname,rhbz563103.so.1 rhbz563103.o -o rhbz563103.so LD_PRELOAD=$(pwd)/rhbz563103.so export LD_PRELOAD +# Workaround #575734 in F-14 +export SKIP_TEST_MKE2JOURNAL_U=1 +export SKIP_TEST_MKE2JOURNAL_L=1 + +# Unknown why this fails - could be also #575734. +export SKIP_TEST_SWAPON_LABEL=1 + %if %{runtests} make check %endif @@ -684,8 +693,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Mar 30 2010 Richard W.M. Jones - 1:1.0.88-6 +* Tue Mar 30 2010 Richard W.M. Jones - 1:1.0.88-7 - Backport of TERM=dumb patch from upstream. +- Workaround failure caused by RHBZ#575734. +- Workaround unknown failure of test_swapon_label_0. * Tue Mar 30 2010 Richard W.M. Jones - 1:1.0.88-5 - Attempted workaround for RHBZ#563103, so we can reenable tests.