From 834f22b465b0bbe9b43734279c515f76dd9297d9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 4 May 2016 18:34:23 +0100
Subject: [PATCH] libguestfs: Handle new-style v1.XX.YY tags.

---
 libguestfs.ml          | 9 +++++++++
 libguestfs_upstream.ml | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/libguestfs.ml b/libguestfs.ml
index 2fe867a..508cbeb 100644
--- a/libguestfs.ml
+++ b/libguestfs.ml
@@ -94,6 +94,15 @@ let git_latest_version branch =
     cd %s/repos/%s-%s
     git describe --tags --abbrev=0
   " buildtmp package (quote branch) in
+  (* Branches <= 1.32 are tagged with "1.32.11",
+   * branches >= 1.33 are tagged with "v1.33.11".
+   *)
+  let len = String.length v in
+  let v =
+    if len > 0 && v.[0] = 'v' then
+      String.sub v 1 (len-1)
+    else
+      v in
   vernames v
 
 (* Get the latest commit. *)
diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index a3450eb..0d41d33 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -135,6 +135,13 @@ and tarball_created version =
 
   let repodir = sprintf "%s/repos/%s-%s" buildtmp package version.branch in
 
+  (* Branches <= 1.32 are tagged with "1.32.11",
+   * branches >= 1.33 are tagged with "v1.33.11".
+   *)
+  let version_tag =
+    if version.minor >= 33 then "v" ^ version.version
+    else version.version in
+
   sh "
     cp -a %s libguestfs
     cd libguestfs
@@ -160,7 +167,7 @@ and tarball_created version =
 
     mv %s %s/tarballs/%s
   " repodir
-    version.version
+    version_tag
     (quote (libguestfs_localconfigure `Git))
     (quote (libguestfs_localenv (supermin version)))
     version.tarball
-- 
1.8.3.1