rpms/ipa
7
0
Fork 0
Code Issues Pull Requests Releases Activity

spec: do not require arch specific ipalib package from noarch packages

Browse Source 
noarch packages should not contain:
  Requires: some-package-{?_isa}
This commit is contained in:
Petr Vobornik 2016-01-06 15:56:58 +01:00
parent b2442d51ba
commit f43314092f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freeipa.spec
View File

@ -365,7 +365,7 @@ BuildArch: noarch
%{?python_provide:%python_provide python2-ipaclient} %{?python_provide:%python_provide python2-ipaclient}
Requires: %{name}-client-common = %{version}-%{release} Requires: %{name}-client-common = %{version}-%{release}
Requires: %{name}-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 Requires: python-dns >= 1.11.1
%description -n python2-ipaclient %description -n python2-ipaclient
@ -402,7 +402,7 @@ Summary: IPA administrative tools
Group: System Environment/Base Group: System Environment/Base
BuildArch: noarch BuildArch: noarch
Requires: %{name}-client-common = %{version}-%{release} Requires: %{name}-client-common = %{version}-%{release}
Requires: python2-ipalib%{?_isa} = %{version}-%{release} Requires: python2-ipalib = %{version}-%{release}
Requires: python-ldap Requires: python-ldap
Provides: %{alt_name}-admintools = %{version} Provides: %{alt_name}-admintools = %{version}
@ -425,7 +425,7 @@ BuildArch: noarch
Obsoletes: %{name}-python < 4.2.91 Obsoletes: %{name}-python < 4.2.91
Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Requires: python2-ipalib%{?_isa} = %{version}-%{release} Requires: python2-ipalib = %{version}-%{release}
Provides: %{alt_name}-python-compat = %{version} Provides: %{alt_name}-python-compat = %{version}
Conflicts: %{alt_name}-python-compat 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 Summary: IPA tests and test tools
BuildArch: noarch BuildArch: noarch
Obsoletes: %{name}-tests < 4.2.91 Obsoletes: %{name}-tests < 4.2.91
Provides: %{name}-tests%{?_isa} = %{version}-%{release} Provides: %{name}-tests = %{version}-%{release}
%{?python_provide:%python_provide python2-ipatests} %{?python_provide:%python_provide python2-ipatests}
Requires: %{name}-client-common = %{version}-%{release} Requires: %{name}-client-common = %{version}-%{release}
Requires: python2-ipalib%{?_isa} = %{version}-%{release} Requires: python2-ipalib = %{version}-%{release}
Requires: tar Requires: tar
Requires: xz Requires: xz
Requires: python-nose Requires: python-nose
@ -575,7 +575,7 @@ Requires: python-polib
Requires: python-pytest-multihost >= 0.5 Requires: python-pytest-multihost >= 0.5
Requires: python-pytest-sourceorder Requires: python-pytest-sourceorder
Provides: %{alt_name}-tests%{?_isa} = %{version} Provides: %{alt_name}-tests = %{version}
Conflicts: %{alt_name}-tests Conflicts: %{alt_name}-tests
Obsoletes: %{alt_name}-tests < %{version} Obsoletes: %{alt_name}-tests < %{version}
@ -595,7 +595,7 @@ Summary: IPA tests and test tools
BuildArch: noarch BuildArch: noarch
%{?python_provide:%python_provide python3-ipatests} %{?python_provide:%python_provide python3-ipatests}
Requires: %{name}-client-common = %{version}-%{release} Requires: %{name}-client-common = %{version}-%{release}
Requires: python3-ipalib%{?_isa} = %{version}-%{release} Requires: python3-ipalib = %{version}-%{release}
Requires: tar Requires: tar
Requires: xz Requires: xz
Requires: python3-nose Requires: python3-nose