From ebbb4d7216246bbb7c814c1512072b5ffa19fde2 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 13 May 2015 14:37:12 -0400
Subject: [PATCH] Fix up building of the apps for the new Makefiles.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 gnu-efi.spec | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu-efi.spec b/gnu-efi.spec
index 443da64..c9063be 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -17,6 +17,16 @@ Patch0001: 0001-Add-setjmp-back-once-again.patch
 # Figure out the right file path to use
 %global efidir %(eval grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
 
+%ifarch x86_64
+%global efiarch x86_64
+%endif
+%ifarch aarch64
+%global efiarch aarch64
+%endif
+%ifarch %{ix86}
+%global efiarch ia32
+%endif
+
 %description
 This package contains development headers and libraries for developing
 applications that run under EFI (Extensible Firmware Interface).
@@ -53,6 +63,7 @@ git config --unset user.name
 %build
 # Package cannot build with %{?_smp_mflags}.
 make
+make apps
 
 %install
 rm -rf %{buildroot}
@@ -64,9 +75,8 @@ make PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} install
 mkdir -p %{buildroot}/%{_libdir}/gnuefi
 mv %{buildroot}/%{_libdir}/*.lds %{buildroot}/%{_libdir}/*.o %{buildroot}/%{_libdir}/gnuefi
 
-make -C apps clean route80h.efi modelist.efi
 mkdir -p %{buildroot}/boot/efi/EFI/%{efidir}/
-mv apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/
+mv %{efiarch}/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/
 
 %clean
 rm -rf %{buildroot}