Update to nbdkit 1.2.4.

This is the latest in upstream stable branch.

This also fixes the path to the tarball for the new directory
structure added when we split nbdkit into stable and unstable
branches.

diff --git a/Makefile b/Makefile
index c38dcb1..0463087 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,8 @@
 
 PWD := $(shell pwd)
 VERSION := $(shell grep ^Version: nbdkit-plugin-vddk.spec | awk '{print $$2}')
+BRANCH_VERSION := $(shell echo $(VERSION) | grep -Eo '^[1-9][0-9]*\.[0-9]+')
+BRANCH_TYPE := $(shell echo $(BRANCH_VERSION) | grep -sq '^.*\.[0-9]*[02468]$$' && echo stable || echo development)
 VDDK_DIR := $(shell grep '^%global vddkdir' nbdkit-plugin-vddk.spec | awk '{print $$3}')
 
 include Makefile.tools
@@ -75,7 +77,7 @@ check-source: nbdkit-$(VERSION).tar.gz
 
 nbdkit-$(VERSION).tar.gz:
        rm -rf $@ $@-t
-       $(DOWNLOAD) http://libguestfs.org/download/nbdkit/$@ > $@-t
+       $(DOWNLOAD) http://download.libguestfs.org/nbdkit/$(BRANCH_VERSION)-$(BRANCH_TYPE)/$@ > $@-t
        mv $@-t $@
 
 clean:

diff --git a/nbdkit-plugin-vddk.spec b/nbdkit-plugin-vddk.spec
index a1e17d9..e5271cf 100644 (file)
--- a/nbdkit-plugin-vddk.spec
+++ b/nbdkit-plugin-vddk.spec
@@ -11,7 +11,7 @@ Name:           nbdkit-plugin-vddk
 # NB: The Version field is parsed out of this file by Makefile, so it
 # can only be a simple number.  Also it must correspond to an nbdkit
 # released version (ideally the latest version).
-Version:        1.1.25
+Version:        1.2.4
 Release:        1%{?dist}
 
 Summary:        VDDK plugin for nbdkit