From c2efe7d099887b71382b95ff595033499ebe6fed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 21 Aug 2019 12:57:56 +0100 Subject: [PATCH] Revert "Remove Requires nbdkit-devel -> nbdkit-server." This change, while strictly correct, wasn't a particularly good idea. While it would be possible in theory to build plugins without having the server around, almost any reasonable build system might then try to test them against the server. But plugins are not compatible with servers compiled with a different pointer size (eg. i686 plugin with x86-64 server). So it's best to pull in the matching server with the devel package. The downside to this is that you cannot install nbdkit-devel.i686 and nbdkit-devel.x86_64 together. This reverts commit 495abe826eb3a077dae9fefa01c5094f5b40cd02. --- nbdkit.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 94400f7..3f9d0e8 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -513,6 +513,7 @@ This package is the xz filter for %{name}. Summary: Development files and documentation for %{name} License: BSD +Requires: %{name}-server%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -875,9 +876,6 @@ make %{?_smp_mflags} check || { %changelog * Wed Aug 21 2019 Richard W.M. Jones - 1.13.8-7 - Add provides for all basic plugins and filters. -- Remove Requires nbdkit-devel -> nbdkit-server. - Still possible to build plugins without needing the server to run - them, eg. when building for multilib. * Tue Aug 20 2019 Richard W.M. Jones - 1.13.8-5 - BR libnbd 0.9.8.