From 707bcdbbc1e54fbd0c8a7fbd5eb76928888c515b Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
Date: Thu, 14 Aug 2014 19:58:51 +0200
Subject: packaging: fix build inconsistency in qemu-accel.spec

qemu-accel shouldn't be built in itself. Linked packages with
proper name (qemu-accel-armv7l, qemu-accel-armv7hl ...) are
used instead. This fixes some build error in prerelease builds
when submitting qemu-accel.

Change-Id: I3556452fa54c3160878983c7272649b08b98a286
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
---
 packaging/qemu-accel.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/qemu-accel.spec b/packaging/qemu-accel.spec
index 8604dbc..e07a39d 100644
--- a/packaging/qemu-accel.spec
+++ b/packaging/qemu-accel.spec
@@ -24,7 +24,7 @@ Requires:       coreutils
 Summary:        Native binaries for speeding up cross compile
 License:        GPL-2.0
 Group:          Development/Libraries/Cross
-ExclusiveArch:  x86_64
+ExclusiveArch:
 
 # default path in qemu
 %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/;s/sparc64.*/sparc64/;s/sparcv.*/sparc/;")
@@ -63,7 +63,7 @@ for executable in $LD \
    /usr/lib64/libnssdbm3.so /usr/lib64/libsoftokn3.so /usr/lib64/libfreebl3.so \
    /usr/bin/{bzip2,cat,expr,make,m4,mkdir,msgexec,msgfmt,msgcat,msgmerge,mv,patch,rm,rmdir,rpmbuild,xz,xzdec} \
    /usr/arm-tizen-linux-gnueabi/bin/{as,ar,ld,ld.bfd,objcopy,objdump}
-do  
+do
   binaries="$binaries $executable `ldd $executable | sed -n 's,.*=> \(/[^ ]*\) .*,\1,p'`"
 done
 
@@ -79,7 +79,7 @@ done
 
 
 %if %hijack_gcc
-# Install 
+# Install
 mkdir -p %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env}
 cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
       %buildroot%{our_path}/usr/share/icecream-envs
@@ -246,7 +246,7 @@ if [ -e /proc/sys/fs/binfmt_misc/arm ]; then
     builtin echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/qemu/qemu-arm-binfmt:P' > /proc/sys/fs/binfmt_misc/register
 fi
 
-if [ $did_mount_it ]; then 
+if [ $did_mount_it ]; then
   builtin echo "Unmounting again.";
   umount /proc/sys/fs/binfmt_misc
 fi
@@ -258,7 +258,7 @@ rm -rf /usr/armv7hl-tizen-linux-gnueabi/lib
 ln -s /lib /usr/armv7hl-tizen-linux-gnueabi/lib
 
 %files
-%defattr(-,root,root)  
+%defattr(-,root,root)
 %dir /usr/armv7hl-tizen-linux-gnueabi
 /usr/armv7hl-tizen-linux-gnueabi/usr
 /emul
-- 
cgit v1.2.3