From f43314092f405024277b1a541f471729bb886a71 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Wed, 6 Jan 2016 15:56:58 +0100 Subject: [PATCH] spec: do not require arch specific ipalib package from noarch packages noarch packages should not contain: Requires: some-package-{?_isa} --- freeipa.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/freeipa.spec b/freeipa.spec index 9c32876..a1de4dc 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -365,7 +365,7 @@ BuildArch: noarch %{?python_provide:%python_provide python2-ipaclient} Requires: %{name}-client-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} -Requires: python2-ipalib%{?_isa} = %{version}-%{release} +Requires: python2-ipalib = %{version}-%{release} Requires: python-dns >= 1.11.1 %description -n python2-ipaclient @@ -402,7 +402,7 @@ Summary: IPA administrative tools Group: System Environment/Base BuildArch: noarch Requires: %{name}-client-common = %{version}-%{release} -Requires: python2-ipalib%{?_isa} = %{version}-%{release} +Requires: python2-ipalib = %{version}-%{release} Requires: python-ldap Provides: %{alt_name}-admintools = %{version} @@ -425,7 +425,7 @@ BuildArch: noarch Obsoletes: %{name}-python < 4.2.91 Provides: %{name}-python = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} -Requires: python2-ipalib%{?_isa} = %{version}-%{release} +Requires: python2-ipalib = %{version}-%{release} Provides: %{alt_name}-python-compat = %{version} Conflicts: %{alt_name}-python-compat @@ -561,10 +561,10 @@ If you are using IPA, you need to install this package. Summary: IPA tests and test tools BuildArch: noarch Obsoletes: %{name}-tests < 4.2.91 -Provides: %{name}-tests%{?_isa} = %{version}-%{release} +Provides: %{name}-tests = %{version}-%{release} %{?python_provide:%python_provide python2-ipatests} Requires: %{name}-client-common = %{version}-%{release} -Requires: python2-ipalib%{?_isa} = %{version}-%{release} +Requires: python2-ipalib = %{version}-%{release} Requires: tar Requires: xz Requires: python-nose @@ -575,7 +575,7 @@ Requires: python-polib Requires: python-pytest-multihost >= 0.5 Requires: python-pytest-sourceorder -Provides: %{alt_name}-tests%{?_isa} = %{version} +Provides: %{alt_name}-tests = %{version} Conflicts: %{alt_name}-tests Obsoletes: %{alt_name}-tests < %{version} @@ -595,7 +595,7 @@ Summary: IPA tests and test tools BuildArch: noarch %{?python_provide:%python_provide python3-ipatests} Requires: %{name}-client-common = %{version}-%{release} -Requires: python3-ipalib%{?_isa} = %{version}-%{release} +Requires: python3-ipalib = %{version}-%{release} Requires: tar Requires: xz Requires: python3-nose