rpms/ostree
5
0
Fork 0
Code Issues Pull Requests Releases Activity

spec: Add requires from subpackages to libs

Browse Source 
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`.
This commit is contained in:
Jonathan Lebon 2018-10-11 16:25:23 -04:00
parent fe4dbeb071
commit b94f5cb216
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ostree.spec
View File

@ -43,6 +43,7 @@ BuildRequires: bison
Requires: dracut Requires: dracut
Requires: /usr/bin/gpgv2 Requires: /usr/bin/gpgv2
Requires: systemd-units Requires: systemd-units
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description %description
libostree is a shared library designed primarily for libostree is a shared library designed primarily for
@ -57,7 +58,7 @@ The %{name}-libs provides shared libraries for %{name}.
%package devel %package devel
Summary: Development headers for %{name} Summary: Development headers for %{name}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel %description devel
The %{name}-devel package includes the header files for the %{name} library. The %{name}-devel package includes the header files for the %{name} library.
@ -79,7 +80,8 @@ GRUB2 integration for OSTree
%if %{with tests} %if %{with tests}
%package tests %package tests
Summary: Tests for the %{name} package 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 %description tests
This package contains tests that can be used to verify This package contains tests that can be used to verify