Do not specify fully versioned arch-specific requires for noarch packages
The Packaging:Guidelines#Requiring_Base_Package explicitly prohibits this by: When a subpackage requires the base package, it must do so using a fully versioned arch-specific (for non-noarch packages) dependency. ^^^ Addressing: BuildError: mismatch when analyzing openscap-content-sectool-0.9.13-5.fc21.noarch.rpm, rpmdiff output was: removed REQUIRES openscap(armv7hl-32) = 0.9.13-5.fc21 removed REQUIRES openscap-engine-sce(armv7hl-32) added REQUIRES openscap(x86-64) = 0.9.13-5.fc21 added REQUIRES openscap-engine-sce(x86-64)
This commit is contained in:
parent
76f42fec70
commit
41faeecd91
@ -6,7 +6,7 @@ restorecon -R /usr/bin/oscap /usr/libexec/openscap; \
|
|||||||
|
|
||||||
Name: openscap
|
Name: openscap
|
||||||
Version: 0.9.13
|
Version: 0.9.13
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
Summary: Set of open source libraries enabling integration of the SCAP line of standards
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -83,8 +83,8 @@ compliance checking using SCAP content.
|
|||||||
%package content-sectool
|
%package content-sectool
|
||||||
Summary: Sectool content
|
Summary: Sectool content
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: %{name}-engine-sce%{?_isa}
|
Requires: %{name}-engine-sce
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description content-sectool
|
%description content-sectool
|
||||||
@ -290,6 +290,9 @@ exit 0
|
|||||||
# %{_mandir}/man8/openscap_selinux.8.*
|
# %{_mandir}/man8/openscap_selinux.8.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 14 2013 Šimon Lukašík <slukasik@redhat.com> - 0.9.13-6
|
||||||
|
- only non-noarch packages should be requiring specific architecture
|
||||||
|
|
||||||
* Sat Nov 09 2013 Šimon Lukašík <slukasik@redhat.com> 0.9.13-5
|
* Sat Nov 09 2013 Šimon Lukašík <slukasik@redhat.com> 0.9.13-5
|
||||||
- specify architecture when requiring base package
|
- specify architecture when requiring base package
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user