Modernize arch-specific requires.

This commit is contained in:
roland 2010-06-03 22:54:24 +00:00
parent 075802b16f
commit 72e901990f

View File

@ -27,6 +27,8 @@
%global nocheck false %global nocheck false
%endif %endif
%global depsuffix %{?_isa}%{!?_isa:-%{_arch}}
Summary: A collection of utilities and DSOs to handle compiled objects Summary: A collection of utilities and DSOs to handle compiled objects
Name: elfutils Name: elfutils
Version: %{eu_version} Version: %{eu_version}
@ -41,8 +43,8 @@ URL: https://fedorahosted.org/elfutils/
Source: http://fedorahosted.org/releases/e/l/elfutils/%{name}-%{version}.tar.bz2 Source: http://fedorahosted.org/releases/e/l/elfutils/%{name}-%{version}.tar.bz2
Patch1: elfutils-robustify.patch Patch1: elfutils-robustify.patch
Patch2: elfutils-portability.patch Patch2: elfutils-portability.patch
Requires: elfutils-libelf-%{_arch} = %{version}-%{release} Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
Requires: elfutils-libs-%{_arch} = %{version}-%{release} Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
%if %{!?rhel:6}%{?rhel} < 6 || %{!?fedora:9}%{?fedora} < 10 %if %{!?rhel:6}%{?rhel} < 6 || %{!?fedora:9}%{?fedora} < 10
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -99,8 +101,10 @@ symbols), readelf (to see the raw ELF file structures), and elflint
%package libs %package libs
Summary: Libraries to handle compiled objects Summary: Libraries to handle compiled objects
Group: Development/Tools Group: Development/Tools
Provides: elfutils-libs-%{_arch} = %{version}-%{release} %if 0%{!?_isa}
Requires: elfutils-libelf-%{_arch} = %{version}-%{release} Provides: elfutils-libs%{depsuffix} = %{version}-%{release}
%endif
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
%description libs %description libs
The elfutils-libs package contains libraries which implement DWARF, ELF, The elfutils-libs package contains libraries which implement DWARF, ELF,
@ -111,11 +115,13 @@ other programs using these libraries.
%package devel %package devel
Summary: Development libraries to handle compiled objects Summary: Development libraries to handle compiled objects
Group: Development/Tools Group: Development/Tools
Provides: elfutils-devel-%{_arch} = %{version}-%{release} %if 0%{!?_isa}
Requires: elfutils-libs-%{_arch} = %{version}-%{release} Provides: elfutils-devel%{depsuffix} = %{version}-%{release}
Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release} %endif
Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
%if !0%{?separate_devel_static} %if !0%{?separate_devel_static}
Requires: elfutils-devel-static-%{_arch} = %{version}-%{release} Requires: elfutils-devel-static%{depsuffix} = %{version}-%{release}
%endif %endif
%description devel %description devel
@ -128,9 +134,11 @@ assembler interface.
%package devel-static %package devel-static
Summary: Static archives to handle compiled objects Summary: Static archives to handle compiled objects
Group: Development/Tools Group: Development/Tools
Provides: elfutils-devel-static-%{_arch} = %{version}-%{release} %if 0%{!?_isa}
Requires: elfutils-devel-%{_arch} = %{version}-%{release} Provides: elfutils-devel-static%{depsuffix} = %{version}-%{release}
Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} %endif
Requires: elfutils-devel%{depsuffix} = %{version}-%{release}
Requires: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release}
%description devel-static %description devel-static
The elfutils-devel-static package contains the static archives The elfutils-devel-static package contains the static archives
@ -139,7 +147,9 @@ with the code to handle compiled objects.
%package libelf %package libelf
Summary: Library to read and write ELF files Summary: Library to read and write ELF files
Group: Development/Tools Group: Development/Tools
Provides: elfutils-libelf-%{_arch} = %{version}-%{release} %if 0%{!?_isa}
Provides: elfutils-libelf%{depsuffix} = %{version}-%{release}
%endif
Obsoletes: libelf <= 0.8.2-2 Obsoletes: libelf <= 0.8.2-2
%description libelf %description libelf
@ -151,10 +161,12 @@ elfutils package use it also to generate new ELF files.
%package libelf-devel %package libelf-devel
Summary: Development support for libelf Summary: Development support for libelf
Group: Development/Tools Group: Development/Tools
Provides: elfutils-libelf-devel-%{_arch} = %{version}-%{release} %if 0%{!?_isa}
Requires: elfutils-libelf-%{_arch} = %{version}-%{release} Provides: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
%endif
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
%if !0%{?separate_devel_static} %if !0%{?separate_devel_static}
Requires: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} Requires: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release}
%endif %endif
Obsoletes: libelf-devel <= 0.8.2-2 Obsoletes: libelf-devel <= 0.8.2-2
@ -167,8 +179,10 @@ different sections of an ELF file.
%package libelf-devel-static %package libelf-devel-static
Summary: Static archive of libelf Summary: Static archive of libelf
Group: Development/Tools Group: Development/Tools
Provides: elfutils-libelf-devel-static-%{_arch} = %{version}-%{release} %if 0%{!?_isa}
Requires: elfutils-libelf-devel-%{_arch} = %{version}-%{release} Provides: elfutils-libelf-devel-static%{depsuffix} = %{version}-%{release}
%endif
Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
%description libelf-devel-static %description libelf-devel-static
The elfutils-libelf-static package contains the static archive The elfutils-libelf-static package contains the static archive