- New stable version 1.12.0.
- Remove upstream patch. - Disable tests on i686 (because of RHBZ#723555).
This commit is contained in:
Richard W.M. Jones
parent
94ad806845
commit
21b563e902
1
.gitignore
vendored
1
.gitignore
vendored
@ -86,3 +86,4 @@ libguestfs-1.5.3.tar.gz
|
||||
/libguestfs-1.11.18.tar.gz
|
||||
/libguestfs-1.11.19.tar.gz
|
||||
/libguestfs-1.11.20.tar.gz
|
||||
/libguestfs-1.12.0.tar.gz
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
--- configure.orig 2011-07-19 19:43:38.952436219 +0100
|
||||
+++ configure 2011-07-19 19:48:04.504543100 +0100
|
||||
@@ -36827,9 +36827,40 @@
|
||||
|
||||
|
||||
if test "x$vmchannel_test" != "xno"; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that $QEMU -help works" >&5
|
||||
+$as_echo_n "checking that $QEMU -help works... " >&6; }
|
||||
+ if $QEMU -help > /dev/null 2>&1; then
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
+$as_echo "yes" >&6; }
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
+as_fn_error $? "$QEMU -help: command failed.
|
||||
+
|
||||
+This could be a very old version of qemu, or qemu might not be
|
||||
+working.
|
||||
+
|
||||
+See \`config.log' for more details" "$LINENO" 5; }
|
||||
+ fi
|
||||
+
|
||||
+ # qemu since 0.15 requires the -machine accel=tcg option, otherwise
|
||||
+ # it won't start up. QEMU DEVELOPERS, PLEASE ADD CAPABILITIES TESTING.
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if this qemu has the -machine accel=tcg option" >&5
|
||||
+$as_echo_n "checking if this qemu has the -machine accel=tcg option... " >&6; }
|
||||
+ if $QEMU -help 2>&1 | grep -sq -- '-machine.*accel.*tcg'; then
|
||||
+ qemu_machine_accel_tcg="-machine accel=tcg"
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qemu_machine_accel_tcg" >&5
|
||||
+$as_echo "$qemu_machine_accel_tcg" >&6; }
|
||||
+ else
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
+$as_echo "no" >&6; }
|
||||
+ fi
|
||||
+
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for virtio-serial support in $QEMU" >&5
|
||||
$as_echo_n "checking for virtio-serial support in $QEMU... " >&6; }
|
||||
- if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
|
||||
+ if $QEMU $qemu_machine_accel_tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@ -29,12 +29,12 @@
|
||||
Summary: Access and modify virtual machine disk images
|
||||
Name: libguestfs
|
||||
Epoch: 1
|
||||
Version: 1.11.20
|
||||
Release: 3%{?dist}
|
||||
Version: 1.12.0
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
Group: Development/Libraries
|
||||
URL: http://libguestfs.org/
|
||||
Source0: http://libguestfs.org/download/1.11-development/%{name}-%{version}.tar.gz
|
||||
Source0: http://libguestfs.org/download/1.12-stable/%{name}-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
|
||||
# Disable FUSE tests, not supported in Koji at the moment.
|
||||
@ -44,9 +44,6 @@ Patch0: libguestfs-1.7.13-no-fuse-test.patch
|
||||
# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
|
||||
Patch1: 0001-perl-Don-t-set-CCFLAGS.patch
|
||||
|
||||
# Upstream patch to fix virtio-serial test for qemu 0.15.
|
||||
Patch2: libguestfs-1.11.20-qemu-virtio-serial-test.patch
|
||||
|
||||
# Basic build requirements:
|
||||
BuildRequires: /usr/bin/pod2man
|
||||
BuildRequires: /usr/bin/pod2text
|
||||
@ -499,7 +496,6 @@ for %{name}.
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
|
||||
mkdir -p daemon/m4
|
||||
|
||||
@ -611,6 +607,7 @@ export LIBGUESTFS_TRACE=1
|
||||
# (FIXED)
|
||||
# 705499 all F-16 file command strange output on file of all zero
|
||||
# 710921 all F-16 ftrace problems (FIXED)
|
||||
# 723555 i386 F-16 GPF when VM shuts down
|
||||
|
||||
# This test fails because we build the ISO after encoding the checksum
|
||||
# of the ISO in the test itself. Need to fix the test to work out the
|
||||
@ -626,9 +623,12 @@ touch $borked
|
||||
chmod +x $borked
|
||||
popd
|
||||
|
||||
# Because of RHBZ#723555.
|
||||
%ifarch x86_64
|
||||
%if %{runtests}
|
||||
make check
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
@ -860,6 +860,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 20 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.12.0-1
|
||||
- New stable version 1.12.0 for Fedora 16.
|
||||
- Remove upstream patch.
|
||||
- Disable tests on i686 (because of RHBZ#723555).
|
||||
|
||||
* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1:1.11.20-3
|
||||
- Perl mass rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user