From 72e901990fd9cb093148f2bde22056b5bd1d0268 Mon Sep 17 00:00:00 2001
From: roland <roland@fedoraproject.org>
Date: Jun 03 2010 22:54:24 +0000
Subject: Modernize arch-specific requires.


---

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