From da0959cafda412144c358b33d0478ea480d2e3c2 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 5 Dec 2019 15:24:49 +0100 Subject: config: Update elfutils.spec with explicit sub-package requires. Consistently require version-release subpackages so that everything is updated together. Technically this isn't always required (it is for elfutils-libelf and elfutils-libs). But this makes things more consistent and prevents multilib version mismatches. Also update a Summary and description to match the current Fedora text. Signed-off-by: Mark Wielaard --- config/ChangeLog | 5 +++++ config/elfutils.spec.in | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index d71fb391..4e289706 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2019-12-05 Mark Wielaard + + * elfutils.spec.in: Add explicit version-release requires for all + packages. + 2019-11-28 Mark Wielaard * elfutils.spec.in (debuginfod): Add an explicit Requires diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in index 1cdca215..d7279c77 100644 --- a/config/elfutils.spec.in +++ b/config/elfutils.spec.in @@ -1,16 +1,16 @@ # -*- rpm-spec-*- -Summary: A collection of utilities and DSOs to handle ELF files and DWARF data Name: elfutils Version: @PACKAGE_VERSION@ Release: 1 URL: http://elfutils.org/ License: GPLv3+ and (GPLv2+ or LGPLv3+) and GFDL Source: ftp://sourceware.org/pub/elfutils/%{version}/elfutils-%{version}.tar.bz2 +Summary: A collection of utilities and DSOs to handle ELF files and DWARF data Requires: elfutils-libelf = %{version}-%{release} Requires: elfutils-libs = %{version}-%{release} # Can be a Recommends if rpm supports that -Requires: elfutils-debuginfod-client +Requires: elfutils-debuginfod-client = %{version}-%{release} BuildRequires: gcc # For libstdc++ demangle support @@ -54,7 +54,7 @@ License: GPLv2+ or LGPLv3+ Requires: elfutils-libelf = %{version}-%{release} Requires: default-yama-scope # Can be a Recommends if rpm supports that -Requires: elfutils-debuginfod-client +Requires: elfutils-debuginfod-client = %{version}-%{release} %description libs The elfutils-libs package contains libraries which implement DWARF, ELF, @@ -68,10 +68,8 @@ Summary: Development libraries to handle compiled objects License: GPLv2+ or LGPLv3+ Requires: elfutils-libs = %{version}-%{release} Requires: elfutils-libelf-devel = %{version}-%{release} -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20 -Recommends: elfutils-debuginfod-client-devel -%else -Requires: elfutils-debuginfod-client-devel +# Can be a Recommends if rpm supports that +Requires: elfutils-debuginfod-client-devel = %{version}-%{release} %endif %description devel @@ -87,8 +85,8 @@ Requires: elfutils-devel = %{version}-%{release} Requires: elfutils-libelf-devel-static = %{version}-%{release} %description devel-static -The elfutils-devel-static archive contains the static archives -with the code the handle compiled objects. +The elfutils-devel-static package contains the static archives +with the code to handle compiled objects. %package libelf Summary: Library to read and write ELF files @@ -144,10 +142,13 @@ License: GPLv3+ and (GPLv2+ or LGPLv3+) %package debuginfod-client-devel Summary: Libraries and headers to build debuginfod client applications License: GPLv2+ or LGPLv3+ +Requires: debuginfod-client = %{version}-%{release} %package debuginfod Summary: HTTP ELF/DWARF file server addressed by build-id License: GPLv3+ +Requires: elfutils-libs = %{version}-%{release} +Requires: elfutils-libelf = %{version}-%{release} Requires: elfutils-debuginfod-client = %{version}-%{release} BuildRequires: systemd Requires(post): systemd -- cgit v1.2.3