From b94f5cb21655219ed7a31265beea5fb9aeccc960 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 11 Oct 2018 16:25:23 -0400 Subject: [PATCH] spec: Add requires from subpackages to libs Got rpmdiff complaining that the `ostree` and `ostree-tests` packages do not have an explicit `Requires` on the libraries. Now, symbol versioning assures us that e.g. the -libs version that we pull for a given `ostree` package will have the symbols we need, but it doesn't guarantee that they'll be the exact same version. Let's add the explicit `Requires` to make this clear since in practice we don't want to have to think about such mismatches. I've also taken the opportunity to normalize on the usage of `_isa` and `epoch` in all the `Requires`. --- ostree.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ostree.spec b/ostree.spec index cf10d91..0f049a9 100644 --- a/ostree.spec +++ b/ostree.spec @@ -43,6 +43,7 @@ BuildRequires: bison Requires: dracut Requires: /usr/bin/gpgv2 Requires: systemd-units +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libostree is a shared library designed primarily for @@ -57,7 +58,7 @@ The %{name}-libs provides shared libraries for %{name}. %package devel Summary: Development headers for %{name} -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel The %{name}-devel package includes the header files for the %{name} library. @@ -79,7 +80,8 @@ GRUB2 integration for OSTree %if %{with tests} %package tests Summary: Tests for the %{name} package -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description tests This package contains tests that can be used to verify