[libguestfs/el5] New upstream version 1.19.13.
Richard W.M. Jones
rjones at fedoraproject.org
Tue Jun 26 23:21:57 UTC 2012
commit 0b9da0f80afe9b97a830e01c514d9c0d000b9bd1
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed Jun 27 00:16:23 2012 +0100
New upstream version 1.19.13.
- Update patches.
...emove-checks-which-fail-with-ancient-qemu.patch | 4 +-
...L-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch | 4 +-
...ace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch | 4 +-
...t-use-C99-style-variable-decls-in-for-loo.patch | 2 +-
0005-EPEL-5-Remove-Erlang-bindings.patch | 4 +-
...ve-GObject-GObject-Introspection-GJS-bind.patch | 4 +-
0007-EPEL-5-Remove-PHP-bindings.patch | 4 +-
0008-EPEL-5-Define-le64toh-if-not-defined.patch | 2 +-
0009-EPEL-5-Add-gnulib-utimensat-module.patch | 2 +-
...ocamlopt-didn-t-support-debugging-g-optio.patch | 10 +++---
...ace-format6-with-format4-in-OCaml-gettext.patch | 4 +-
...s-preserve-dup-deps-explicitly-to-libtool.patch | 4 +-
...ve-id-from-drive-parameter-on-qemu-comman.patch | 2 +-
...null-vmchannel-back-for-qemu-without-virt.patch | 2 +-
...5-Fix-blkid-to-return-LVM2_member-for-PVs.patch | 2 +-
...sify-Fix-command-line-options-for-old-qem.patch | 2 +-
0017-EPEL-5-Remove-Fedora-MD-test-images.patch | 8 ++--
0018-EPEL-5-Add-mkisofs-to-package-list.patch | 2 +-
...1-second-pause-after-unmounting-any-files.patch | 2 +-
...EL-5-Don-t-run-regression-test-for-790721.patch | 4 +-
...w-parallel-mount-local-test-to-be-skipped.patch | 37 --------------------
libguestfs.spec | 11 +++---
sources | 2 +-
23 files changed, 43 insertions(+), 79 deletions(-)
---
diff --git a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
index 1f69d97..1d7743a 100644
--- a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
+++ b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
@@ -1,4 +1,4 @@
-From dbd3527715c430c03a6a94871d0ed818bbc40771 Mon Sep 17 00:00:00 2001
+From ec832ebaab57328aae0e403ddbb68830a0af0fbc Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 10:19:39 +0100
Subject: [PATCH 01/20] EPEL 5: Remove checks which fail with ancient qemu.
@@ -11,7 +11,7 @@ be empty strings.
2 files changed, 2 insertions(+), 69 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 3b0ea11..8932f16 100644
+index dc2a103..75d2c5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -573,63 +573,6 @@ This could be a very old version of qemu, or qemu might not be
diff --git a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
index def82eb..2418333 100644
--- a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
+++ b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
@@ -1,4 +1,4 @@
-From 7d8e72d40f3a0d23dc2b5ca3e2b20c8eae7aecae Mon Sep 17 00:00:00 2001
+From 0caa5ea6b7ec3db3e2959c9d94d530728feded92 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 10:23:19 +0100
Subject: [PATCH 02/20] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
@@ -8,7 +8,7 @@ Subject: [PATCH 02/20] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 8932f16..d0f5582 100644
+index 75d2c5e..6bcb86e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1311,33 +1311,33 @@ echo
diff --git a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
index 8f59881..1f54b56 100644
--- a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
+++ b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
@@ -1,4 +1,4 @@
-From b21144431f382801194ac5407c5b9d24c41b941b Mon Sep 17 00:00:00 2001
+From 8574fda19307d84ec72472c650c81cebe7a8ec81 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 10:46:20 +0100
Subject: [PATCH 03/20] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
@@ -8,7 +8,7 @@ Subject: [PATCH 03/20] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index d0f5582..d29bb4a 100644
+index 6bcb86e..5e67931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,7 @@ dnl Check sizeof long.
diff --git a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch b/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
index 454c5b0..e74dd5e 100644
--- a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
+++ b/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
@@ -1,4 +1,4 @@
-From 26fa681c4c55fe15513c86cde67237f8364058f8 Mon Sep 17 00:00:00 2001
+From bbce9576f61fc2a5108950fb85a2a1de300e5888 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 13:55:44 +0100
Subject: [PATCH 04/20] EPEL 5: Don't use C99-style variable decls in for-loop.
diff --git a/0005-EPEL-5-Remove-Erlang-bindings.patch b/0005-EPEL-5-Remove-Erlang-bindings.patch
index 022eac9..5ffd7a5 100644
--- a/0005-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0005-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,4 +1,4 @@
-From d704229f97c5a63de5921b72ee96dc5cb4887d1b Mon Sep 17 00:00:00 2001
+From 90d6987412c2f9e413f826c6e52bc24fa5de5723 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 14:34:25 +0100
Subject: [PATCH 05/20] EPEL 5: Remove Erlang bindings.
@@ -24,7 +24,7 @@ index be9191c..6bd6047 100644
SUBDIRS += gobject
endif
diff --git a/configure.ac b/configure.ac
-index d29bb4a..63fd338 100644
+index 5e67931..399a726 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1115,25 +1115,6 @@ AS_IF([test "x$enable_php" != "xno"],
diff --git a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
index df0f70c..bc7ac6f 100644
--- a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
+++ b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
@@ -1,4 +1,4 @@
-From 52fe6ceb87d8716abe2d32c1b3ca6476d8519b50 Mon Sep 17 00:00:00 2001
+From cffb90f873293433eb9dcc1d30e75effedc1fe5c Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sat, 16 Jun 2012 14:35:06 +0100
Subject: [PATCH 06/20] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
@@ -24,7 +24,7 @@ index 6bd6047..88e3815 100644
# Unconditional because nothing is built yet.
SUBDIRS += csharp
diff --git a/configure.ac b/configure.ac
-index 63fd338..939abbf 100644
+index 399a726..4d60102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,67 +1136,6 @@ AS_IF([test "x$PERL" != "xno"],
diff --git a/0007-EPEL-5-Remove-PHP-bindings.patch b/0007-EPEL-5-Remove-PHP-bindings.patch
index 1b62d6a..90a355c 100644
--- a/0007-EPEL-5-Remove-PHP-bindings.patch
+++ b/0007-EPEL-5-Remove-PHP-bindings.patch
@@ -1,4 +1,4 @@
-From 067a995aa89974ec39d9e1c7440e7b9a3c5fca87 Mon Sep 17 00:00:00 2001
+From 03db70c2ea3c259134cef2b638dc3ea5056ae1d6 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 23:01:43 +0100
Subject: [PATCH 07/20] EPEL 5: Remove PHP bindings.
@@ -24,7 +24,7 @@ index 88e3815..5175bf3 100644
# Unconditional because nothing is built yet.
SUBDIRS += csharp
diff --git a/configure.ac b/configure.ac
-index 939abbf..79058a0 100644
+index 4d60102..1b1c22f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1101,20 +1101,6 @@ AS_IF([test "x$enable_haskell" != "xno"],
diff --git a/0008-EPEL-5-Define-le64toh-if-not-defined.patch b/0008-EPEL-5-Define-le64toh-if-not-defined.patch
index ffaab59..bdbe5a9 100644
--- a/0008-EPEL-5-Define-le64toh-if-not-defined.patch
+++ b/0008-EPEL-5-Define-le64toh-if-not-defined.patch
@@ -1,4 +1,4 @@
-From 4712064a62cc47b3dfe4a5d55cd4ec2bca620f1d Mon Sep 17 00:00:00 2001
+From 68386824ed0ff8ded849deda07cbb1f9d7eb71a2 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 22:17:06 +0100
Subject: [PATCH 08/20] EPEL 5: Define le64toh if not defined.
diff --git a/0009-EPEL-5-Add-gnulib-utimensat-module.patch b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
index ebcea66..f9fe6cb 100644
--- a/0009-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,4 +1,4 @@
-From e5cbefd66a60cae7fb2d4172c9077b4546ee1b58 Mon Sep 17 00:00:00 2001
+From f14d4f6577e5ca9689e38be35bf6322731d43399 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 22:58:58 +0100
Subject: [PATCH 09/20] EPEL 5: Add gnulib utimensat module.
diff --git a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch b/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
index b04b000..7acec7d 100644
--- a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
+++ b/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
@@ -1,4 +1,4 @@
-From 2e6685e188d5661a16ebc21ba7fdac976e5a8e50 Mon Sep 17 00:00:00 2001
+From 293789946c9f39603307c5481acff06d18299685 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Sun, 17 Jun 2012 23:00:16 +0100
Subject: [PATCH 10/20] EPEL 5: Old ocamlopt didn't support debugging (-g option).
@@ -11,7 +11,7 @@ Subject: [PATCH 10/20] EPEL 5: Old ocamlopt didn't support debugging (-g option)
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
-index f22f3f4..90bce15 100644
+index 232edb7..aac27a2 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -45,7 +45,7 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
@@ -24,7 +24,7 @@ index f22f3f4..90bce15 100644
noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
diff --git a/resize/Makefile.am b/resize/Makefile.am
-index 8d87ab9..1d71a8b 100644
+index b613bb7..ab9033f 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -62,7 +62,7 @@ OCAMLPACKAGES += -package gettext-stub
@@ -37,7 +37,7 @@ index 8d87ab9..1d71a8b 100644
virt-resize: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
-index f4002e3..f824f53 100644
+index 5df30a8..4ed4254 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -61,7 +61,7 @@ OCAMLPACKAGES += -package gettext-stub
@@ -50,7 +50,7 @@ index f4002e3..f824f53 100644
virt-sparsify: $(OBJECTS)
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
-index be233a9..149285b 100644
+index 7d20e10..a9be3f9 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -122,7 +122,7 @@ OCAMLPACKAGES += -package gettext-stub
diff --git a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
index 9db8f56..02d56ca 100644
--- a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
+++ b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
@@ -1,4 +1,4 @@
-From f4e0a0bbbb40124afd98d80f2b1b1a69df4b9d30 Mon Sep 17 00:00:00 2001
+From 3526cb18a65ee6766c68f401e0b0ef2c6506e53e Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 08:35:14 +0100
Subject: [PATCH 11/20] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
@@ -8,7 +8,7 @@ Subject: [PATCH 11/20] EPEL 5: Replace format6 with format4 in OCaml gettext rou
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 79058a0..84ce3a8 100644
+index 1b1c22f..c684e24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -786,14 +786,14 @@ EOF
diff --git a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
index 4a7512f..008adee 100644
--- a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
+++ b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
@@ -1,4 +1,4 @@
-From c1b3d471bc4f7e754765559b20b25610e707d075 Mon Sep 17 00:00:00 2001
+From ea45202e070a592ff5cadabf053dee607a765056 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 12:18:35 +0100
Subject: [PATCH 12/20] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
@@ -10,7 +10,7 @@ https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 84ce3a8..53edfe4 100644
+index c684e24..6dc1aa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1128,7 +1128,7 @@ AC_SUBST(MAX_PROC_NR)
diff --git a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
index 500ccd9..597fd21 100644
--- a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
+++ b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
@@ -1,4 +1,4 @@
-From dc0acbad966bf4bfa4e211957707ffe300a805d3 Mon Sep 17 00:00:00 2001
+From 1a9f894cbc2467c3b79f20a6de74a9070f8f30ef Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 17:21:30 +0100
Subject: [PATCH 13/20] EPEL 5: Remove id= from -drive parameter on qemu command line.
diff --git a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
index e4cde38..99f7935 100644
--- a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
+++ b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
@@ -1,4 +1,4 @@
-From cb8e7f77d5dd32ab6760db4fd10bb654f6dd225f Mon Sep 17 00:00:00 2001
+From 1bf6cb7241d8d76e40b5e89f5219da681d98350a Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Mon, 18 Jun 2012 16:06:34 +0100
Subject: [PATCH 14/20] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
diff --git a/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
index 106c50c..a4c7d60 100644
--- a/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
+++ b/0015-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
@@ -1,4 +1,4 @@
-From 80f897a296f6a9eab6fcabaff372338a4441e0d3 Mon Sep 17 00:00:00 2001
+From 1a242d8084c7376a51b7ea0a8b53db79b11b04bf Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 10:06:47 +0100
Subject: [PATCH 15/20] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
diff --git a/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch b/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
index 52d721a..f40e2c6 100644
--- a/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
+++ b/0016-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
@@ -1,4 +1,4 @@
-From ce21f625938f8f8bd0dfdf603c5d89b5ebc9666b Mon Sep 17 00:00:00 2001
+From 06ca4eebe87808d650a441a8f936afb0b7d1f0b4 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 10:24:48 +0100
Subject: [PATCH 16/20] EPEL 5: sparsify: Fix command line options for old qemu-img.
diff --git a/0017-EPEL-5-Remove-Fedora-MD-test-images.patch b/0017-EPEL-5-Remove-Fedora-MD-test-images.patch
index 76dfd54..8318d4a 100644
--- a/0017-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0017-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,4 +1,4 @@
-From 44bdc038ddeb4cf85eeef3d611e7c53b859450f7 Mon Sep 17 00:00:00 2001
+From a61d5f78cad9d28df1955dc33755a5d822dca208 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 13:15:49 +0100
Subject: [PATCH 17/20] EPEL 5: Remove Fedora MD test images.
@@ -10,7 +10,7 @@ eg. '/dev/md/boot'.
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am
-index 3e5aea0..649cebe 100644
+index 77ce61b..ad8ca5a 100644
--- a/tests/guests/Makefile.am
+++ b/tests/guests/Makefile.am
@@ -38,7 +38,7 @@ EXTRA_DIST = \
@@ -24,7 +24,7 @@ index 3e5aea0..649cebe 100644
@@ -51,19 +51,6 @@ fedora.img: guest-aux/make-fedora-img.pl \
LAYOUT=partitions \
- ../../run $<
+ ../../run --test $<
-# Make a (dummy) Fedora image using md devices
-fedora-md1.img fedora-md2.img: stamp-fedora-md.img
@@ -36,7 +36,7 @@ index 3e5aea0..649cebe 100644
- TMPDIR=$(top_builddir) \
- SRCDIR=$(srcdir) \
- LAYOUT=partitions-md \
-- ../../run $<
+- ../../run --test $<
- touch $@
-
guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
diff --git a/0018-EPEL-5-Add-mkisofs-to-package-list.patch b/0018-EPEL-5-Add-mkisofs-to-package-list.patch
index 51aa6d0..81b491c 100644
--- a/0018-EPEL-5-Add-mkisofs-to-package-list.patch
+++ b/0018-EPEL-5-Add-mkisofs-to-package-list.patch
@@ -1,4 +1,4 @@
-From db0c35d9e0c903a8ef81dcf1ed743c0b14f9da52 Mon Sep 17 00:00:00 2001
+From f111929f1b5c1c5a4091cf66608370cda539eccb Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 14:46:43 +0100
Subject: [PATCH 18/20] EPEL 5: Add mkisofs to package list.
diff --git a/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch b/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
index 01ca046..66ea197 100644
--- a/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+++ b/0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
@@ -1,4 +1,4 @@
-From 38543d688e3894815088ae98ad200fa5bbc3fdec Mon Sep 17 00:00:00 2001
+From 7da9fb725679c81fb641b97e502bad75815df65c Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 22 Jun 2012 21:58:32 +0100
Subject: [PATCH 19/20] EPEL 5: Add 1 second pause after unmounting any filesystem.
diff --git a/0020-EPEL-5-Don-t-run-regression-test-for-790721.patch b/0020-EPEL-5-Don-t-run-regression-test-for-790721.patch
index 5955dba..0868df4 100644
--- a/0020-EPEL-5-Don-t-run-regression-test-for-790721.patch
+++ b/0020-EPEL-5-Don-t-run-regression-test-for-790721.patch
@@ -1,4 +1,4 @@
-From 177209566130b98dc1b256762e761b71c2fdf14a Mon Sep 17 00:00:00 2001
+From cba3aaf3cb4802d5571445a97688e6977fed5a13 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Tue, 26 Jun 2012 20:28:13 +0100
Subject: [PATCH 20/20] EPEL 5: Don't run regression test for 790721.
@@ -9,7 +9,7 @@ Segfaults for reasons not understood.
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am
-index 3027cd8..8e1976c 100644
+index 22a364c..cfa7856 100644
--- a/tests/regressions/Makefile.am
+++ b/tests/regressions/Makefile.am
@@ -27,12 +27,12 @@ TESTS = \
diff --git a/libguestfs.spec b/libguestfs.spec
index 6753572..e199395 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -21,8 +21,8 @@
Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
-Version: 1.19.12
-Release: 3%{?dist}
+Version: 1.19.13
+Release: 1%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -62,9 +62,6 @@ Patch0018: 0018-EPEL-5-Add-mkisofs-to-package-list.patch
Patch0019: 0019-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
Patch0020: 0020-EPEL-5-Don-t-run-regression-test-for-790721.patch
-# Patch upstream in libguestfs >= 1.19.13.
-Patch0021: 0021-ocaml-Allow-parallel-mount-local-test-to-be-skipped.patch
-
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@@ -913,6 +910,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jun 25 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.13-1
+- New upstream version 1.19.13.
+- Update patches.
+
* Tue Jun 25 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.12-3
- New upstream version 1.19.12.
- Update patches.
diff --git a/sources b/sources
index 66c136c..97576aa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
f2577d577727581a1eee95df18bf5624 gnulib-4fb7ea20122.tar.gz
-ffb422af2c1bc3c47883f4a55298ec55 libguestfs-1.19.12.tar.gz
+e9e467e31ad21b50c5d35edc579e2682 libguestfs-1.19.13.tar.gz
More information about the scm-commits
mailing list