This package is obsolete. See README.OBSOLETE file for details.

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index 5dd3503..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*~
-
-nbdkit-1.*
-nbdkit-1.*.tar.gz
-*.rpm
-
-/BUILDROOT
-/Makefile.tools
-/x86_64

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 0463087..0000000
--- a/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# nbdkit-plugin-vddk
-# Copyright (C) 2013-2017 Richard W.M. Jones.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# * Neither the name of Red Hat nor the names of its contributors may be
-# used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-# See README.
-
-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
-
-all: check-vddk check-source
-       $(RPMBUILD) -ba \
-           --define "_topdir $(PWD)" \
-           --define "_builddir $(PWD)" \
-           --define "_rpmdir $(PWD)" \
-           --define "_sourcedir $(PWD)" \
-           --define "_specdir $(PWD)" \
-           --define "_srcrpmdir $(PWD)" \
-           nbdkit-plugin-vddk.spec
-
-Makefile.tools:
-       @rm -rf $@ $@-t
-       @if ! rpmbuild --help >/dev/null 2>&1; then \
-           echo -n "‘rpmbuild’ not installed or not working. "; \
-           echo "Install the ‘rpm-build’ package."; \
-           exit 1; \
-       else \
-           echo 'RPMBUILD=rpmbuild' >> $@-t; \
-       fi
-       @if wget --help >/dev/null 2>&1; then \
-           echo 'DOWNLOAD=wget -O -' >> $@-t; \
-       elif curl --help >/dev/null 2>&1; then \
-           echo 'DOWNLOAD=curl -L' >> $@-t; \
-       else \
-           echo -n "‘wget’ nor ‘curl’ is installed and working."; \
-           echo "Install the ‘wget’ or ‘curl’ package."; \
-           exit 1; \
-       fi
-       @mv $@-t $@
-
-check-vddk:
-       @if ! [ -d $(VDDK_DIR) ] || ! [ -d $(VDDK_DIR)/include ]; then echo -e "You must download VDDK and edit ‘nbdkit-plugin-vddk.spec’ to point ‘vddkdir’\nto the location where you unpacked VDDK."; exit 1; fi
-
-check-source: nbdkit-$(VERSION).tar.gz
-
-nbdkit-$(VERSION).tar.gz:
-       rm -rf $@ $@-t
-       $(DOWNLOAD) http://download.libguestfs.org/nbdkit/$(BRANCH_VERSION)-$(BRANCH_TYPE)/$@ > $@-t
-       mv $@-t $@
-
-clean:
-       rm -f *~
-       rm -f *.src.rpm
-       rm -rf x86_64
-       rm -rf BUILDROOT
-
-.PHONY: all check-source check-vddk clean

diff --git a/README b/README
deleted file mode 100644 (file)
index 0d5657c..0000000
--- a/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This repository contains a specfile allowing you to build the nbdkit
-VDDK plugin as an RPM.
-
-Note that you will need VDDK, downloaded from VMware's website:
-
-  https://www.vmware.com/support/developer/vddk/
-
-and unpacked into a directory somewhere.
-
-You must edit ‘nbdkit-plugin-vddk.spec’ and set the ‘vddkdir’ variable
-to point to the directory where you unpacked VDDK.
-
-To build the RPM just type ‘make’.  (If you have missing dependencies
-then make will give an error, so fix the problem and run make again.)

diff --git a/README.OBSOLETE b/README.OBSOLETE
new file mode 100644 (file)
index 0000000..066c41a
--- /dev/null
+++ b/README.OBSOLETE
@@ -0,0 +1,5 @@
+This package is obsolete.  nbdkit since version 1.5.2 is able to
+compile the VDDK plugin without needing the VDDK library around, so
+just use upstream nbdkit.
+
+https://github.com/libguestfs/nbdkit/commit/8d7f7c26eb435334d7fa35e84ceee7d266dfae4c

diff --git a/nbdkit-plugin-vddk.spec b/nbdkit-plugin-vddk.spec
deleted file mode 100644 (file)
index e5271cf..0000000
--- a/nbdkit-plugin-vddk.spec
+++ /dev/null
@@ -1,78 +0,0 @@
-# You must set this to the directory where you downloaded VDDK.
-# NB. DO NOT PUT A TRAILING ‘/’ or you will get the error
-# ‘canonicalization unexpectedly shrank by one character’ on RHEL 7.
-%global vddkdir /home/rjones/tmp/vddk/vmware-vix-disklib-distrib
-
-# The minimum version of nbdkit that we can build/install with.
-%global minimum_version 1.1.2
-
-
-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.2.4
-Release:        1%{?dist}
-
-Summary:        VDDK plugin for nbdkit
-License:        BSD
-
-Source0:        nbdkit-%{version}.tar.gz
-
-BuildRequires:  nbdkit-devel >= %{minimum_version}
-BuildRequires:  perl-podlators
-BuildRequires:  gnutls-devel
-
-Requires:       nbdkit >= %{minimum_version}
-
-# Make sure the final package doesn't actually depend on the
-# VDDK library.
-%global __requires_exclude .*libvixDiskLib\\.so.*
-
-
-%description
-This package contains the VDDK plugin for nbdkit.
-NB: it does not contain VDDK itself.  You have to download that
-separately yourself.
-
-
-%prep
-%setup -q -n nbdkit-%{version}
-%configure \
-    --disable-perl \
-    --disable-python \
-    --disable-ocaml \
-    --disable-ruby \
-    --without-curl \
-    --without-libvirt \
-    --without-zlib \
-    --without-liblzma \
-    --without-libguestfs \
-    --with-vddk=%{vddkdir}
-
-
-%build
-# Note we're only building the plugin, and we want to build it
-# against the installed nbdkit.
-pushd plugins/vddk
-make %{_smp_mflags}
-popd
-
-
-%install
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/nbdkit/plugins
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-pushd plugins/vddk
-%make_install
-popd
-
-# Kill libtool files with fire.
-find $RPM_BUILD_ROOT -name '*.la' -delete
-
-
-%files
-%{_libdir}/nbdkit/plugins/nbdkit-vddk-plugin.so
-%{_mandir}/man1/nbdkit-vddk-plugin.1*
-
-
-%changelog