packages: spice-space/spice-space.spec - rel 3 - disable tunneling support ...

[baggins]

Author: baggins                      Date: Wed Feb 15 12:25:24 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- disable tunneling support with bcond,
  dependency on our external slirp breaks qemu build

---- Files affected:
packages/spice-space:
   spice-space.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/spice-space/spice-space.spec
diff -u packages/spice-space/spice-space.spec:1.7 packages/spice-space/spice-space.spec:1.8
--- packages/spice-space/spice-space.spec:1.7	Wed Feb 15 12:46:10 2012
+++ packages/spice-space/spice-space.spec	Wed Feb 15 13:25:19 2012
@@ -1,10 +1,14 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	slirp		# build with tunneling support (breaks qemu)
+#
 Summary:	SPICE virtualization solution
 Summary(pl.UTF-8):	System wirtualizacji SPICE
 # real package name (spice) is already occupied
 Name:		spice-space
 Version:	0.10.1
-Release:	2
+Release:	3
 License:	LGPL v2.1+
 Group:		Applications/Emulators
 Source0:	http://spice-space.org/download/releases/spice-%{version}.tar.bz2
@@ -20,12 +24,13 @@
 BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	libcacard-devel >= 0.1.2
 BuildRequires:	libjpeg-devel
-BuildRequires:	libslirp-devel
+%{?with_slirp:BuildRequires:	libslirp-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
 BuildRequires:	pixman-devel >= 0.17.7
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.527
 BuildRequires:	spice-protocol >= 0.10.1
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel
@@ -70,7 +75,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki serwera SPICE
 Group:		Development/Libraries
 Requires:	celt051-devel >= 0.5.1.1
-Requires:	libslirp-devel
+%{?with_slirp:Requires:	libslirp-devel}
 Requires:	openssl-devel
 Requires:	pixman-devel >= 0.17.7
 Requires:	spice-server-libs = %{version}-%{release}
@@ -124,7 +129,7 @@
 	--disable-silent-rules \
 	--enable-opengl \
 	--enable-smartcard \
-	--enable-tunnel
+	%{?with_slirp:en}%{!?with_slirp:dis}able-tunnel
 # --enable-gui		BR: CEGUI-devel >= 0.6.0 < 0.7.0
 
 %{__make}
@@ -170,6 +175,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/02/15 12:25:19  baggins
+- rel 3
+- disable tunneling support with bcond,
+  dependency on our external slirp breaks qemu build
+
 Revision 1.7  2012/02/15 11:46:10  baggins
 - rel 2
 - spice-server-devel requires libslirp-devel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-space/spice-space.spec?r1=1.7&r2=1.8&f=u