From d982505ef96168cffa5493f4fbbfe4322b4bdd44 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Mar 13 2013 15:32:19 +0000
Subject: Bundle correct copy of ./bootstrap from upstream sources.


---

diff --git a/bootstrap b/bootstrap
index be0dfe4..931646b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -68,6 +68,7 @@ maintainer-makefile
 manywarnings
 memmem
 mkdtemp
+mkstemps
 netdb
 netinet_in
 openat
diff --git a/libguestfs.spec b/libguestfs.spec
index 684c9e7..43de449 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.20.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -32,7 +32,10 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # KVM is only available on x86-64.
 ExclusiveArch: x86_64
 
-# We have to update gnulib (in a patch) hence unfortunately ...
+# We have to add a gnulib module (in a patch below), so this means we
+# need to bundle the whole gnulib sources.  In theory the gnulib
+# utimensat module could go upstream, but the license is incompatible
+# (GPL, not LGPLv2+).
 Source10:      bootstrap
 Source11:      dot-gitmodules
 Source12:      gnulib-4a8c422f.tar.gz
@@ -911,7 +914,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Mar 13 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.4-1
+* Wed Mar 13 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.4-2
 - Rebase to upstream stable branch version 1.20.4.
 
 * Mon Mar 11 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.3-6