From bb2fc3ecbb9a8afee0a01eaa05dc9d60168beded5a15f8626c72181f739da6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 24 May 2013 17:25:32 +0000 Subject: [PATCH] Accepting request 176522 from home:a_faerber:branches:Virtualization Use %_smp_mflags and enable brlapi (adopted from kvm package) OBS-URL: https://build.opensuse.org/request/show/176522 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=140 --- qemu-linux-user.changes | 5 +++++ qemu-linux-user.spec | 2 +- qemu-linux-user.spec.in | 2 +- qemu.changes | 10 ++++++++++ qemu.spec | 8 +++++++- qemu.spec.in | 8 +++++++- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 65046828..1cdec2e6 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 24 12:33:23 UTC 2013 - afaerber@suse.de + +- Use %{?_smp_mflags} rather than %{?jobs:-j%jobs} + ------------------------------------------------------------------- Tue May 21 21:13:25 UTC 2013 - afaerber@suse.de diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 98f1a982..04c3d2a6 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -182,7 +182,7 @@ run cross-architecture builds. # -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak %endif -make %{?jobs:-j%jobs} V=1 +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT diff --git a/qemu-linux-user.spec.in b/qemu-linux-user.spec.in index 7c8b086a..798484af 100644 --- a/qemu-linux-user.spec.in +++ b/qemu-linux-user.spec.in @@ -108,7 +108,7 @@ PATCH_EXEC # -lrt needs to come after -lglib-2.0 to avoid undefined clock_gettime sed -i "s/-lglib-2.0/-lglib-2.0 -lrt/" config-host.mak %endif -make %{?jobs:-j%jobs} V=1 +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT diff --git a/qemu.changes b/qemu.changes index 03e7cae4..fc54d626 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri May 24 14:31:59 UTC 2013 - afaerber@suse.de + +- Enable brlapi as done for kvm package + +------------------------------------------------------------------- +Fri May 24 12:33:23 UTC 2013 - afaerber@suse.de + +- Use %{?_smp_mflags} rather than %{?jobs:-j%jobs} + ------------------------------------------------------------------- Thu May 23 15:08:42 UTC 2013 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 3f48ee5d..692bc248 100644 --- a/qemu.spec +++ b/qemu.spec @@ -71,6 +71,9 @@ BuildRequires: SDL-devel BuildRequires: alsa-devel BuildRequires: bison BuildRequires: bluez-devel +%if 0%{?suse_version} >= 1130 +BuildRequires: brlapi-devel +%endif BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel @@ -220,6 +223,9 @@ This sub-package contains the guest agent. --enable-curl \ --enable-virtfs \ --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ +%if 0%{?suse_version} >= 1130 + --enable-brlapi \ +%endif %if 0%{?suse_version} >= 1210 --enable-gtk \ %endif @@ -232,7 +238,7 @@ This sub-package contains the guest agent. %else --disable-spice %endif -make %{?jobs:-j%jobs} V=1 +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT diff --git a/qemu.spec.in b/qemu.spec.in index d8919630..e935965f 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -34,6 +34,9 @@ BuildRequires: SDL-devel BuildRequires: alsa-devel BuildRequires: bison BuildRequires: bluez-devel +%if 0%{?suse_version} >= 1130 +BuildRequires: brlapi-devel +%endif BuildRequires: curl-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel @@ -146,6 +149,9 @@ PATCH_EXEC --enable-curl \ --enable-virtfs \ --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ +%if 0%{?suse_version} >= 1130 + --enable-brlapi \ +%endif %if 0%{?suse_version} >= 1210 --enable-gtk \ %endif @@ -158,7 +164,7 @@ PATCH_EXEC %else --disable-spice %endif -make %{?jobs:-j%jobs} V=1 +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT