Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2012-02-29 14:11:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2012-02-24 06:54:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu.changes 2012-02-29 14:11:03.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 11:49:55 UTC 2012 - [email protected] + +- Enable spice support + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.xrwkU5/_old 2012-02-29 14:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xrwkU5/_new 2012-02-29 14:11:07.000000000 +0100 @@ -92,18 +92,25 @@ BuildRequires: zlib-devel %endif %if 0%{?suse_version} >= 1210 -BuildRequires: libattr-devel-static BuildRequires: glibc-devel-static +BuildRequires: libattr-devel-static BuildRequires: libfdt1-devel %endif %if 0%{?suse_version} >= 1140 BuildRequires: glib2-devel-static %endif -BuildRequires: libvdeplug3-devel +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 +BuildRequires: libspice-server-devel +BuildRequires: spice-protocol-devel +%endif +%endif +BuildRequires: fdupes BuildRequires: glib2-devel +BuildRequires: libvdeplug3-devel BuildRequires: python -BuildRequires: fdupes -Requires: timezone virt-utils +Requires: timezone +Requires: virt-utils %description QEMU is an extremely well-performing CPU emulator that allows you to @@ -181,7 +188,20 @@ # build QEMU mkdir -p dynamic # build qemu-system -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir --interp-prefix=%_datadir/%name/qemu-i386 --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ +--interp-prefix=%_datadir/%name/qemu-i386 \ +--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ +--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ +--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \ +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 +--enable-spice +%else +--disable-spice +%endif +%else +--disable-spice +%endif # curl test fails for no reason in build system echo "CONFIG_CURL=y" >> config-host.mak echo "CURL_LIBS=-lcurl" >> config-host.mak @@ -191,7 +211,12 @@ mv */qemu */qemu-* qemu-io dynamic || true make clean # build userland emus -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir --interp-prefix=%_datadir/%name/qemu-i386 --enable-linux-user --disable-system --static --disable-linux-aio --extra-cflags="$QEMU_OPT_FLAGS" +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ +--interp-prefix=%_datadir/%name/qemu-i386 \ +--enable-linux-user \ +--disable-system \ +--static --disable-linux-aio \ +--extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%jobs} V=1 %install ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.xrwkU5/_old 2012-02-29 14:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xrwkU5/_new 2012-02-29 14:11:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qemu # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: qemu Url: http://fabrice.bellard.free.fr/qemu/ -License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) -Group: System/Emulators/PC Summary: Universal CPU emulator -Version: 1.0 +License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT +Group: System/Emulators/PC +Version: 1.0.1 Release: 0 Source: %name-%version.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc +Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: bison @@ -55,11 +54,18 @@ %if 0%{?suse_version} >= 1140 BuildRequires: glib2-devel-static %endif +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 +BuildRequires: libspice-server-devel +BuildRequires: spice-protocol-devel +%endif +%endif BuildRequires: libvdeplug3-devel BuildRequires: glib2-devel BuildRequires: python BuildRequires: fdupes -Requires: timezone virt-utils +Requires: timezone +Requires: virt-utils %description QEMU is an extremely well-performing CPU emulator that allows you to @@ -92,11 +98,20 @@ # build QEMU mkdir -p dynamic # build qemu-system -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ - --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \ - --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \ - --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\ + --interp-prefix=%_datadir/%name/qemu-i386 \\ + --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \\ + --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \\ + --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \\ +%if 0%{?suse_version} >= 1130 +%ifarch %ix86 x86_64 + --enable-spice +%else + --disable-spice +%endif +%else + --disable-spice +%endif # curl test fails for no reason in build system echo "CONFIG_CURL=y" >> config-host.mak echo "CURL_LIBS=-lcurl" >> config-host.mak @@ -106,11 +121,11 @@ mv */qemu */qemu-* qemu-io dynamic || true make clean # build userland emus -./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ - --interp-prefix=%_datadir/%name/qemu-i386 \ - --enable-linux-user \ - --disable-system \ - --static --disable-linux-aio \ +./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\ + --interp-prefix=%_datadir/%name/qemu-i386 \\ + --enable-linux-user \\ + --disable-system \\ + --static --disable-linux-aio \\ --extra-cflags="$QEMU_OPT_FLAGS" make %{?jobs:-j%jobs} V=1 ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.xrwkU5/_old 2012-02-29 14:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xrwkU5/_new 2012-02-29 14:11:07.000000000 +0100 @@ -38,7 +38,7 @@ if [ "$line" = "PATCH_FILES" ]; then for i in 0*; do NUM=${i%%-*} - echo "Patch$NUM: $i" + echo -e "Patch$NUM:\t$i" done elif [ "$line" = "PATCH_EXEC" ]; then for i in 0*; do -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
