rpms
/
annobin
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct a package rename 

annobin-9.65 which only contained documentation was renamed to
annobin-docs in in 9.66. The Provide is kept for compatibility
(redhat-rpm-config).

The docs subpackage must be required by all the other ones because it
packages a license.
This commit is contained in:
Petr Písař 2021-04-16 13:05:54 +02:00
parent 985cb77f4c
commit 62f4dedb91
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
annobin.spec
View File

@ -2,7 +2,7 @@
Name: annobin
Summary: Annotate and examine compiled binary files
Version: 9.66
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
# ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark
# Maintainer: nickc@redhat.com
@ -169,8 +169,10 @@ Also provides a plugin for LLVM which performs a similar function.
%package docs
Summary: Documentation and shell scripts for use with annobin
BuildArch: noarch
Obsoletes: %{name} < %{version}-%{release}
Obsoletes: %{name}-docs < %{version}-%{release}
# annobin renamed to annobin-doc in 9.66-1
Provides: %{name} = %{version}-%{release}
# /usr/share/info/annobin.info.gz moved from annobin to annobin-docs
Conflicts: %{name} < 9.66-1
%description docs
Provides the documentation files and example shell scripts for use with annobin.
@ -180,6 +182,7 @@ Provides the documentation files and example shell scripts for use with annobin.
%package tests
Summary: Test scripts and binaries for checking the behaviour and output of the annobin plugin
Requires: %{name}-docs = %{version}-%{release}
%description tests
Provides a means to test the generation of annotated binaries and the parsing
@ -198,6 +201,7 @@ BuildRequires: gcc elfutils elfutils-devel elfutils-libelf-devel rpm-devel binut
BuildRequires: elfutils-debuginfod-client-devel
BuildRequires: make
%endif
Requires: %{name}-docs = %{version}-%{release}
%description annocheck
Installs the annocheck program which uses the notes generated by annobin to
@ -212,6 +216,7 @@ hardening options.
%package plugin-gcc
Summary: annobin gcc plugin
Requires: %{name}-docs = %{version}-%{release}
Conflicts: annobin <= 9.60-1
%description plugin-gcc
@ -225,6 +230,7 @@ Installs an annobin plugin that can be used by gcc.
%package plugin-llvm
Summary: annobin llvm plugin
Requires: %{name}-docs = %{version}-%{release}
Conflicts: annobin <= 9.60-1
%description plugin-llvm
@ -238,6 +244,7 @@ Installs an annobin plugin that can be used by llvm tools.
%package plugin-clang
Summary: annobin clang plugin
Requires: %{name}-docs = %{version}-%{release}
Conflicts: annobin <= 9.60-1
%description plugin-clang
@ -402,6 +409,10 @@ fi
#---------------------------------------------------------------------------------
%changelog
* Fri Apr 16 2021 Petr Pisar <ppisar@redhat.com> - 9.66-3
- Correct a package rename (bug #1949570)
- Require docs subpackage by the other ones because of a license
* Thu Apr 15 2021 Martin Cermak <mcermak@redhat.com> - 9.66-2
- Fix bz1949570