Accepting request 176565 from home:a_faerber:branches:Virtualization

Enable pulseaudio support, various tidy-ups inspired by kvm package

OBS-URL: https://build.opensuse.org/request/show/176565
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=143

qemu-linux-user.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat May 25 15:50:49 UTC 2013 - afaerber@suse.de
+
+- Amend licenses list with GPL-2.0 (adopted from kvm package)
+- virtfs-proxy-helper.1 shouldn't be installed anymore
+
 -------------------------------------------------------------------
 Fri May 24 19:57:35 UTC 2013 - afaerber@suse.de
 

qemu-linux-user.spec

@@ -19,7 +19,7 @@
 Name:           qemu-linux-user
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
-License:        BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
+License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 Version:        1.5.0
 Release:        0
@@ -176,7 +176,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT/%_datadir/doc
 rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu.1
 rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
-rm -rf $RPM_BUILD_ROOT/%_mandir/man1/virtfs-proxy-helper.1
 rm -rf $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
 rm -rf $RPM_BUILD_ROOT/%_datadir/qemu/keymaps
 rm -rf $RPM_BUILD_ROOT/%_sysconfdir/qemu/target-x86_64.conf

qemu-linux-user.spec.in

@@ -19,7 +19,7 @@
 Name:           qemu-linux-user
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
-License:        BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
+License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 Version:        1.5.0
 Release:        0
@@ -102,7 +102,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT/%_datadir/doc
 rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu.1
 rm -rf $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
-rm -rf $RPM_BUILD_ROOT/%_mandir/man1/virtfs-proxy-helper.1
 rm -rf $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
 rm -rf $RPM_BUILD_ROOT/%_datadir/qemu/keymaps
 rm -rf $RPM_BUILD_ROOT/%_sysconfdir/qemu/target-x86_64.conf

qemu.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat May 25 15:50:49 UTC 2013 - afaerber@suse.de
+
+- Really enable pulseaudio and oss support (bnc#737070)
+- Amend licenses list with GPL-2.0 (adopted from kvm package)
+- Be explicit in enabling features our packaging relies on
+- Disable stripping at QEMU level
+- Use %optflags rather than $QEMU_OPT_FLAGS
+
 -------------------------------------------------------------------
 Fri May 24 19:57:35 UTC 2013 - afaerber@suse.de
 

qemu.spec

@@ -19,7 +19,7 @@
 Name:           qemu
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
-License:        BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
+License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 Version:        1.5.0
 Release:        0
@@ -97,6 +97,7 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libpixman-1-0-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libpulse-devel
 BuildRequires:  libvdeplug3-devel
 %if 0%{?suse_version} > 1220
 BuildRequires:  makeinfo
@@ -214,25 +215,40 @@ This sub-package contains the guest agent.
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
 	--libexecdir=%_libexecdir \
-	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
+	--extra-cflags="%{optflags}" \
-	--enable-curl \
+	--disable-strip \
-	--enable-virtfs \
+	--enable-system --disable-linux-user \
-	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
+	--enable-tools --enable-guest-agent \
+	--enable-docs \
+	--audio-drv-list="pa alsa sdl oss" --enable-mixemu \
 %if 0%{?suse_version} >= 1130
         --enable-brlapi \
 %endif
+	--enable-cap-ng \
+	--enable-curl \
+	--enable-curses \
 %if 0%{?suse_version} >= 1210
 	--enable-gtk \
 %endif
+	--enable-linux-aio \
+	--enable-sdl \
 %if 0%{?suse_version} >= 1140
 %ifarch %ix86 x86_64
-	--enable-spice
+	--enable-spice \
 %else
-	--disable-spice
+	--disable-spice \
 %endif
 %else
-	--disable-spice
+	--disable-spice \
 %endif
+	--enable-vde \
+	--enable-virtfs \
+	--enable-vnc-jpeg \
+	--enable-vnc-png \
+	--enable-vnc-sasl \
+	--enable-vnc-tls \
+	--enable-vnc-ws \
+
 make %{?_smp_mflags} V=1
 
 %install

qemu.spec.in

@@ -19,7 +19,7 @@
 Name:           qemu
 Url:            http://www.qemu.org/
 Summary:        Universal CPU emulator
-License:        BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
+License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 Version:        1.5.0
 Release:        0
@@ -60,6 +60,7 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libpixman-1-0-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libpulse-devel
 BuildRequires:  libvdeplug3-devel
 %if 0%{?suse_version} > 1220
 BuildRequires:  makeinfo
@@ -140,25 +141,40 @@ PATCH_EXEC
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
 	--libexecdir=%_libexecdir \
-	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
+	--extra-cflags="%{optflags}" \
-	--enable-curl \
+	--disable-strip \
-	--enable-virtfs \
+	--enable-system --disable-linux-user \
-	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
+	--enable-tools --enable-guest-agent \
+	--enable-docs \
+	--audio-drv-list="pa alsa sdl oss" --enable-mixemu \
 %if 0%{?suse_version} >= 1130
         --enable-brlapi \
 %endif
+	--enable-cap-ng \
+	--enable-curl \
+	--enable-curses \
 %if 0%{?suse_version} >= 1210
 	--enable-gtk \
 %endif
+	--enable-linux-aio \
+	--enable-sdl \
 %if 0%{?suse_version} >= 1140
 %ifarch %ix86 x86_64
-	--enable-spice
+	--enable-spice \
 %else
-	--disable-spice
+	--disable-spice \
 %endif
 %else
-	--disable-spice
+	--disable-spice \
 %endif
+	--enable-vde \
+	--enable-virtfs \
+	--enable-vnc-jpeg \
+	--enable-vnc-png \
+	--enable-vnc-sasl \
+	--enable-vnc-tls \
+	--enable-vnc-ws \
+
 make %{?_smp_mflags} V=1
 
 %install