From 7e6c7ba0d64fb043312faee3e8c6732339782999 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Dec 2023 17:10:25 +0000 Subject: [PATCH] Fix bug in generator/Makefile.am which causes builds to fail on i686. --- ...le.am-Fix-missing-continuation-backs.patch | 26 +++++++++++++++++++ libnbd.spec | 9 ++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 0001-generator-Makefile.am-Fix-missing-continuation-backs.patch diff --git a/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch b/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch new file mode 100644 index 0000000..c2cd547 --- /dev/null +++ b/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch @@ -0,0 +1,26 @@ +From 11372ab9801f69b48404246cd3f9ec65b41b473b Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 19 Dec 2023 17:08:07 +0000 +Subject: [PATCH] generator/Makefile.am: Fix missing continuation backslash + +Fixes: commit 2829b92aefb89a098e11a36b252383563a4e543a +--- + generator/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/generator/Makefile.am b/generator/Makefile.am +index c9555f5269..38509124d0 100644 +--- a/generator/Makefile.am ++++ b/generator/Makefile.am +@@ -111,7 +111,7 @@ stamp-generator: + echo; \ + echo "Install the OCaml bytecode compiler (the program called ‘ocamlc’)"; \ + echo "and rerun ./configure && make"; \ +- echo; ++ echo; \ + echo "OR build from the tarballs at https://download.libguestfs.org/libnbd/"; \ + echo "which include generated files."; \ + echo; \ +-- +2.43.0 + diff --git a/libnbd.spec b/libnbd.spec index 3a33c90..3e03c88 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -2,14 +2,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.19-development Name: libnbd Version: 1.19.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -25,6 +25,9 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Fixes bug in generator/Makefile.am which causes builds to fail on i686. +Patch: 0001-generator-Makefile.am-Fix-missing-continuation-backs.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -375,7 +378,7 @@ make %{?_smp_mflags} check || { %changelog -* Tue Dec 19 2023 Richard W.M. Jones - 1.19.3-1 +* Tue Dec 19 2023 Richard W.M. Jones - 1.19.3-2 - New upstream development version 1.19.3 * Mon Dec 18 2023 Richard W.M. Jones - 1.19.2-4