Add upstream patch after 1.5.10 to fix build.

This commit is contained in:
Richard W.M. Jones 2018-08-27 12:19:01 +01:00
parent cdd1bda62e
commit 1461b159c6
2 changed files with 31 additions and 4 deletions

View File

@ -0,0 +1,25 @@
From 9aa3a2a229e1dc3936e0295b05e151b4ef9a8826 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 27 Aug 2018 12:17:33 +0100
Subject: [PATCH] common/sparse: Fix include directory for nbdkit-plugin.h.
Fixes commit 5986c3063ee1d2f28a33d01006bc31b596b4d5f6.
---
common/sparse/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/sparse/Makefile.am b/common/sparse/Makefile.am
index b6cf2f9..6d73878 100644
--- a/common/sparse/Makefile.am
+++ b/common/sparse/Makefile.am
@@ -38,6 +38,7 @@ libsparse_la_SOURCES = \
sparse.c \
sparse.h
libsparse_la_CPPFLAGS = \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/common/include
libsparse_la_CFLAGS = \
$(WARNINGS_CFLAGS)
--
2.18.0

View File

@ -25,14 +25,14 @@
%global verify_tarball_signature 1
# If there are patches which touch autotools files, set this to 1.
%global patches_touch_autotools %{nil}
%global patches_touch_autotools 1
# The source directory.
%global source_directory 1.5-development
Name: nbdkit
Version: 1.5.10
Release: 1%{?dist}
Release: 2%{?dist}
Summary: NBD server
License: BSD
@ -45,6 +45,8 @@ Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name
Source2: libguestfs.keyring
%endif
Patch1: 0001-common-sparse-Fix-include-directory-for-nbdkit-plugi.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool
%endif
@ -950,9 +952,9 @@ popd
%changelog
* Mon Aug 27 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.10-1
* Mon Aug 27 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.10-2
- New upstream version 1.5.10.
- Remove upstream patches.
- Add upstream patch after 1.5.10 to fix build.
* Sun Aug 26 2018 Richard W.M. Jones <rjones@redhat.com> - 1.5.9-2
- New upstream version 1.5.9.