Accepting request 133145 from home:vuntz:branches:Virtualization

Add some BuildRequires to build features we want, especially virtfs. 3rd sr...

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

qemu.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Sep  7 07:04:08 UTC 2012 - vuntz@suse.com
+
+- Add libcap-devel BuildRequires since it's needed to enable VirtFS
+  support.
+- Add libcap-ng-devel BuildRequires to be able to drop privileges
+  in qemu-bridge-helper.
+- Add libjpeg-devel and libpng-devel BuildRequires to enable VNC
+  jpeg and png support.
+- Pass --enable-virtfs to configure to detect changes that will
+  cause VirtFS support to not be built.
+
 -------------------------------------------------------------------
 Wed Sep  5 17:39:17 UTC 2012 - afaerber@suse.de
 

qemu.spec

@@ -71,8 +71,12 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  libaio
 BuildRequires:  libaio-devel
 BuildRequires:  libattr-devel
+BuildRequires:  libcap-devel
+BuildRequires:  libcap-ng-devel
 BuildRequires:  libgnutls-devel
+BuildRequires:  libjpeg-devel
 BuildRequires:  libpcap-devel
+BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 # we must not install the qemu package when under qemu build
 %if 0%{?qemu_user_space_build:1}
@@ -211,6 +215,7 @@ mkdir -p dynamic
 	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
 	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
 	--enable-curl \
+	--enable-virtfs \
 	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
 %if 0%{?suse_version} >= 1130
 %ifarch %ix86 x86_64
@@ -226,6 +231,7 @@ mv *-softmmu/qemu-system-* dynamic
 mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
 mv qemu-img.1 qemu-nbd.8 dynamic
 mv qemu-ga dynamic
+mv fsdev/virtfs-proxy-helper{,.1} dynamic
 make clean
 # build userland emus
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@@ -248,12 +254,14 @@ install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
 install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
 install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
 install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/virtfs-proxy-helper $RPM_BUILD_ROOT/%_bindir
 install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
 install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
 install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
 install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
 install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
 install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
+install -m 644 dynamic/virtfs-proxy-helper.1 $RPM_BUILD_ROOT/%_mandir/man1
 install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
 install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
@@ -298,10 +306,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %files tools
 %defattr(-, root, root)
 %doc %_mandir/man1/qemu-img.1.gz
+%doc %_mandir/man1/virtfs-proxy-helper.1.gz
 %doc %_mandir/man8/qemu-nbd.8.gz
 %_bindir/qemu-io
 %_bindir/qemu-img
 %_bindir/qemu-nbd
+%_bindir/virtfs-proxy-helper
 %verify(not mode) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf

qemu.spec.in

@@ -39,8 +39,13 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  libaio
 BuildRequires:  libaio-devel
 BuildRequires:  libattr-devel
+BuildRequires:  libcap-devel
+BuildRequires:  libcap-ng-devel
 BuildRequires:  libgnutls-devel
+BuildRequires:  libjpeg-devel
 BuildRequires:  libpcap-devel
+BuildRequires:  libpng-devel
+BuildRequires:  mozilla-nss-devel >= 3.12.8
 BuildRequires:  ncurses-devel
 # we must not install the qemu package when under qemu build
 %if 0%{?qemu_user_space_build:1}
@@ -147,6 +152,7 @@ mkdir -p dynamic
 	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
 	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
 	--enable-curl \
+	--enable-virtfs \
 	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
 %if 0%{?suse_version} >= 1130
 %ifarch %ix86 x86_64
@@ -162,6 +168,7 @@ mv *-softmmu/qemu-system-* dynamic
 mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
 mv qemu-img.1 qemu-nbd.8 dynamic
 mv qemu-ga dynamic
+mv fsdev/virtfs-proxy-helper{,.1} dynamic
 make clean
 # build userland emus
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@@ -184,12 +191,14 @@ install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
 install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
 install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
 install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
+install -m 755 dynamic/virtfs-proxy-helper $RPM_BUILD_ROOT/%_bindir
 install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
 install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
 install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
 install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
 install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
 install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
+install -m 644 dynamic/virtfs-proxy-helper.1 $RPM_BUILD_ROOT/%_mandir/man1
 install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
 install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
@@ -234,10 +243,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %files tools
 %defattr(-, root, root)
 %doc %_mandir/man1/qemu-img.1.gz
+%doc %_mandir/man1/virtfs-proxy-helper.1.gz
 %doc %_mandir/man8/qemu-nbd.8.gz
 %_bindir/qemu-io
 %_bindir/qemu-img
 %_bindir/qemu-nbd
+%_bindir/virtfs-proxy-helper
 %verify(not mode) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf