New upstream version 1.29.20.
This commit is contained in:
parent
8aa478bd2f
commit
aedaf2a125
25
0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
Normal file
25
0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 5ab3a75e1dba7cacd45ff9a094bf27c517edd117 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||||
|
Date: Sat, 17 Jan 2015 14:24:35 +0000
|
||||||
|
Subject: [PATCH] tests/lvm: Allow test-lvm-mapping.pl to be skipped.
|
||||||
|
|
||||||
|
---
|
||||||
|
tests/lvm/test-lvm-mapping.pl | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/tests/lvm/test-lvm-mapping.pl b/tests/lvm/test-lvm-mapping.pl
|
||||||
|
index 79a5bdd..2509231 100755
|
||||||
|
--- a/tests/lvm/test-lvm-mapping.pl
|
||||||
|
+++ b/tests/lvm/test-lvm-mapping.pl
|
||||||
|
@@ -22,6 +22,8 @@ use warnings;
|
||||||
|
|
||||||
|
use Sys::Guestfs;
|
||||||
|
|
||||||
|
+exit 77 if $ENV{SKIP_TEST_LVM_MAPPING_PL};
|
||||||
|
+
|
||||||
|
my $g = Sys::Guestfs->new ();
|
||||||
|
|
||||||
|
$g->add_drive_scratch (256 * 1024 * 1024);
|
||||||
|
--
|
||||||
|
2.1.0
|
||||||
|
|
@ -24,7 +24,7 @@
|
|||||||
Summary: Access and modify virtual machine disk images
|
Summary: Access and modify virtual machine disk images
|
||||||
Name: libguestfs
|
Name: libguestfs
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.29.19
|
Version: 1.29.20
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
|
|
||||||
@ -32,6 +32,9 @@ License: LGPLv2+
|
|||||||
URL: http://libguestfs.org/
|
URL: http://libguestfs.org/
|
||||||
Source0: http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz
|
Source0: http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
# Upstream patch to allow LVM test to be skipped in check section.
|
||||||
|
Patch1: 0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
|
||||||
|
|
||||||
# Basic build requirements:
|
# Basic build requirements:
|
||||||
BuildRequires: perl(Pod::Simple)
|
BuildRequires: perl(Pod::Simple)
|
||||||
BuildRequires: perl(Pod::Man)
|
BuildRequires: perl(Pod::Man)
|
||||||
@ -729,14 +732,14 @@ for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
|
if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
|
||||||
# For sVirt to work, the local temporary directory we use in the
|
# For sVirt to work, the local temporary directory we use in the
|
||||||
# tests must be labelled the same way as /tmp.
|
# tests must be labelled the same way as /tmp.
|
||||||
chcon --reference=/tmp tmp
|
chcon --reference=/tmp tmp
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p daemon/m4
|
|
||||||
|
|
||||||
# Replace developer-centric README that ships with libguestfs, with
|
# Replace developer-centric README that ships with libguestfs, with
|
||||||
# our replacement file.
|
# our replacement file.
|
||||||
mv README README.orig
|
mv README README.orig
|
||||||
@ -825,6 +828,12 @@ export SKIP_TEST_SET_LABEL=1
|
|||||||
export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
|
export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
|
||||||
export SKIP_TEST_VIRT_DF_GUESTS_SH=1
|
export SKIP_TEST_VIRT_DF_GUESTS_SH=1
|
||||||
|
|
||||||
|
# Disable sfdisk test (RHBZ#1183234).
|
||||||
|
export SKIP_TEST_PART_GET_MBR_ID_0=1
|
||||||
|
|
||||||
|
# Disable a test which uses sfdisk (RHBZ#1183236).
|
||||||
|
export SKIP_TEST_LVM_MAPPING_PL=1
|
||||||
|
|
||||||
# Skip gnulib tests which fail (probably these are kernel/glibc bugs).
|
# Skip gnulib tests which fail (probably these are kernel/glibc bugs).
|
||||||
pushd gnulib/tests
|
pushd gnulib/tests
|
||||||
make -k check ||:
|
make -k check ||:
|
||||||
@ -1226,6 +1235,14 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.20-1
|
||||||
|
- New upstream version 1.29.20.
|
||||||
|
|
||||||
|
- Rebuild upstream with automake 1.15.
|
||||||
|
- Add upstream patch to allow LVM test to be skipped.
|
||||||
|
- Skip a couple of tests which are broken by changes in Rawhide.
|
||||||
|
- Remove bogus daemon/m4 directory which has not existed for years.
|
||||||
|
|
||||||
* Tue Dec 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.19-1
|
* Tue Dec 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.19-1
|
||||||
- New upstream version 1.29.19.
|
- New upstream version 1.29.19.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user