From 5eec5ce3e3f2fc4fe537dc9fc5a2046205c8a924ef8f6de466492b0b62bf373c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 25 May 2013 13:20:26 +0000 Subject: [PATCH] Accepting request 176540 from home:a_faerber:branches:Virtualization Fix ppc qemu-linux-user build by moving directories from qemu package to qemu-linux-user (still unclear to me what they are useful for though...) OBS-URL: https://build.opensuse.org/request/show/176540 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=142 --- qemu-linux-user.changes | 6 ++++++ qemu-linux-user.spec | 7 +++++++ qemu-linux-user.spec.in | 7 +++++++ qemu.changes | 5 +++++ qemu.spec | 9 --------- qemu.spec.in | 9 --------- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 4f1a7f83..0d0befbe 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 24 19:57:35 UTC 2013 - afaerber@suse.de + +- Fix ppc builds by packaging /emul/ia32-linux (previously in qemu) + and /usr/share/qemu/qemu-i386 + ------------------------------------------------------------------- Fri May 24 16:28:50 UTC 2013 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 18f4867c..c1d4bf5b 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -224,5 +224,12 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/qemu-x86_64 %_bindir/qemu-*-binfmt %_sbindir/qemu-binfmt-conf.sh +%ifnarch %ix86 x86_64 ia64 +%dir /emul/ia32-linux +%endif +%ifnarch %ix86 x86_64 +%dir /usr/share/qemu +/usr/share/qemu/qemu-i386 +%endif %changelog diff --git a/qemu-linux-user.spec.in b/qemu-linux-user.spec.in index 752e1287..6f3d378a 100644 --- a/qemu-linux-user.spec.in +++ b/qemu-linux-user.spec.in @@ -150,5 +150,12 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/qemu-x86_64 %_bindir/qemu-*-binfmt %_sbindir/qemu-binfmt-conf.sh +%ifnarch %ix86 x86_64 ia64 +%dir /emul/ia32-linux +%endif +%ifnarch %ix86 x86_64 +%dir /usr/share/qemu +/usr/share/qemu/qemu-i386 +%endif %changelog diff --git a/qemu.changes b/qemu.changes index c53c5a9a..ebec8cfc 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 24 19:57:35 UTC 2013 - afaerber@suse.de + +- Move /emul/ia32-linux to qemu-linux-user + ------------------------------------------------------------------- Fri May 24 17:11:36 UTC 2013 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 133be973..315ef94f 100644 --- a/qemu.spec +++ b/qemu.spec @@ -239,12 +239,6 @@ make %{?_smp_mflags} V=1 make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf -%ifnarch %ix86 x86_64 -ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 -%endif -%ifnarch ia64 -mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux -%endif %if 0%{?suse_version} >= 1210 %find_lang %name %endif @@ -274,9 +268,6 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/qemu-system-* %doc %_mandir/man1/qemu.1.gz %_datadir/%name -%ifnarch %ix86 x86_64 ia64 -%dir /emul/ia32-linux -%endif %dir %_sysconfdir/%name %config %_sysconfdir/%name/target-x86_64.conf diff --git a/qemu.spec.in b/qemu.spec.in index 672c340e..815f513a 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -165,12 +165,6 @@ make %{?_smp_mflags} V=1 make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf -%ifnarch %ix86 x86_64 -ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 -%endif -%ifnarch ia64 -mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux -%endif %if 0%{?suse_version} >= 1210 %find_lang %name %endif @@ -200,9 +194,6 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/qemu-system-* %doc %_mandir/man1/qemu.1.gz %_datadir/%name -%ifnarch %ix86 x86_64 ia64 -%dir /emul/ia32-linux -%endif %dir %_sysconfdir/%name %config %_sysconfdir/%name/target-x86_64.conf