[openscap/f19] Do not specify fully versioned arch-specific requires for noarch packages

[Šimon Lukašík]

commit 86636bd75ff7464a5f2e1203e8e783d8b1276846
Author: Simon Lukasik <slukasik at redhat.com>
Date:   Thu Nov 14 17:23:57 2013 +0100

    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)
    
    (cherry picked from commit 41faeecd91743db07d9d09e5e4a1a7011bf86b85)

 openscap.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/openscap.spec b/openscap.spec
index e551c47..17aaf25 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -6,7 +6,7 @@ restorecon -R /usr/bin/oscap /usr/libexec/openscap; \
 
 Name:           openscap
 Version:        0.9.13
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -84,8 +84,8 @@ compliance checking using SCAP content.
 %package        content-sectool
 Summary:        Sectool content
 Group:          Applications/System
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-engine-sce%{?_isa}
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-engine-sce
 BuildArch:      noarch
 
 %description    content-sectool
@@ -291,6 +291,9 @@ exit 0
 # %{_mandir}/man8/openscap_selinux.8.*
 
 %changelog
+* Thu Nov 14 2013 Šimon Lukašík <slukasik at redhat.com> - 0.9.13-6
+- only non-noarch packages should be requiring specific architecture
+
 * Sat Nov 09 2013 Šimon Lukašík <slukasik at redhat.com> 0.9.13-5
 - specify architecture when requiring base package