rpms
/
libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Include further fixes to virt-resize from upstream.

This commit is contained in:
Richard W.M. Jones 2011-04-10 20:43:52 +01:00
parent 6659e73510
commit c8007bb93e
5 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-resize-Link-with-local-copy-of-guestfs.patch
View File

@ -1,7 +1,7 @@
From 047173d18683a66cbe8949bc114833984898fed6 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Sat, 9 Apr 2011 22:50:15 +0100
Subject: [PATCH 1/3] resize: Link with local copy of guestfs.
Subject: [PATCH 1/4] resize: Link with local copy of guestfs.
---
resize/Makefile.am | 4 ++--

2
0002-resize-Missing-n-after-version.patch
View File

@ -1,7 +1,7 @@
From 61a42ff551073daf345bd03941797e6af1e97128 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Sun, 10 Apr 2011 11:06:58 +0100
Subject: [PATCH 2/3] resize: Missing \n after version.
Subject: [PATCH 2/4] resize: Missing \n after version.
---
resize/resize.ml | 2 +-

2
0003-resize-Consistent-use-of-part-in-help-output.patch
View File

@ -1,7 +1,7 @@
From a6cb8fee205b1615d380456964bebe40bd840fb1 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Sun, 10 Apr 2011 11:12:03 +0100
Subject: [PATCH 3/3] resize: Consistent use of 'part' in help output.
Subject: [PATCH 3/4] resize: Consistent use of 'part' in help output.
---
resize/resize.ml | 8 ++++----

24
0004-resize-Don-t-build-this-directory-in-parallel.patch Normal file
View File

@ -0,0 +1,24 @@
From d600d53868237e0f2828a912d9672dbd480e315f Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Sun, 10 Apr 2011 20:42:42 +0100
Subject: [PATCH 4/4] resize: Don't build this directory in parallel.
---
resize/Makefile.am | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 3740a4a..93c193e 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -98,3 +98,7 @@ include .depend
endif
endif
+
+# Parallel builds don't obey dependencies for some reason we
+# don't understand.
+.NOTPARALLEL:
--
1.7.4.1

6
libguestfs.spec
View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.9.18
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -44,6 +44,7 @@ Patch0: libguestfs-1.7.13-no-fuse-test.patch
Patch1: 0001-resize-Link-with-local-copy-of-guestfs.patch
Patch2: 0002-resize-Missing-n-after-version.patch
Patch3: 0003-resize-Consistent-use-of-part-in-help-output.patch
Patch4: 0004-resize-Don-t-build-this-directory-in-parallel.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
@ -442,6 +443,7 @@ php-%{name} contains PHP bindings for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
mkdir -p daemon/m4
@ -780,7 +782,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Apr 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-3
* Sun Apr 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-4
- Include further fixes to virt-resize from upstream.
* Sat Apr 9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-2