packages: xorg-driver-video-qxl/xorg-driver-video-qxl.spec - added spice-xs...

[qboosh]

Author: qboosh                       Date: Tue Jul 26 19:52:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added spice-xserver package

---- Files affected:
packages/xorg-driver-video-qxl:
   xorg-driver-video-qxl.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-qxl/xorg-driver-video-qxl.spec
diff -u packages/xorg-driver-video-qxl/xorg-driver-video-qxl.spec:1.3 packages/xorg-driver-video-qxl/xorg-driver-video-qxl.spec:1.4
--- packages/xorg-driver-video-qxl/xorg-driver-video-qxl.spec:1.3	Mon Jul 25 20:51:34 2011
+++ packages/xorg-driver-video-qxl/xorg-driver-video-qxl.spec	Tue Jul 26 21:52:03 2011
@@ -1,5 +1,8 @@
 # $Revision$, $Date$
-# TODO: xspice driver? (--enable-xspice=yes, BR: spice-server-devel >= 0.6.3)
+#
+# Conditional build:
+%bcond_without	xspice	# xspice driver
+#
 Summary:	X.org video driver for QXL virtual GPU
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla wirtualnych procesorów graficznych QXL
 Name:		xorg-driver-video-qxl
@@ -16,6 +19,7 @@
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	rpmbuild(macros) >= 1.389
 BuildRequires:	spice-protocol >= 0.8.1
+%{?with_xspice:BuildRequires:	spice-server-devel >= 0.6.3}
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.10.0
 BuildRequires:	xorg-proto-fontsproto-devel
 BuildRequires:	xorg-proto-randrproto-devel
@@ -39,6 +43,33 @@
 które można znaleźć w systemie RedHat Enterprise Virtualisation oraz
 w projekcie spice.
 
+%package -n spice-xserver
+Summary:	Xspice - X server and Spice server in one
+Summary(pl.UTF-8):	Xspice - serwer X oraz serwer Spice w jednym
+Group:		X11/Applications
+Requires:	xorg-xserver-server >= 1.0.99.901
+Requires:	spice-server-libs >= 0.6.3
+
+%description -n spice-xserver
+Xspice is an X server and Spice server in one. It consists of a
+wrapper script for executing Xorg with the right parameters and
+environment variables, a module named spiceqxl_drv.so implementing
+three drivers: a video mostly code identical to the guest qxl X
+driver, and keyboard and mouse reading from the spice inputs channel.
+
+Xspice allows regular X connections, while a spice client provides the
+keyboard and mouse and video output.
+
+%description -n spice-xserver -l pl.UTF-8
+Xspice to serwer X i serwer Spice w jednym. Składa się ze skryptu
+wywołującego Xorg z właściwymi parametrami i zmiennymi środowiskowymi,
+oraz modułu o nazwie spiceqxl_drv.so implementującego trzy sterowniki:
+graficzny oparty na kodzie prawie identycznym ze sterownikiem X gościa
+qxl, oraz klawiatury i myszy szytające z kanału wejćiowego spice.
+
+Xspice pozwala na normalne połączenia X, podczas gdy klient spice
+udostępnia wejście klawiatury i myszy oraz wyjście obrazu.
+
 %prep
 %setup -q -n xf86-video-qxl-%{version}
 
@@ -48,7 +79,8 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{?with_xspice:--enable-xspice}
 
 %{__make}
 
@@ -68,12 +100,23 @@
 %doc COPYING ChangeLog README TODO
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/qxl_drv.so
 
+%if %{with xspice}
+%files -n spice-xserver
+%defattr(644,root,root,755)
+%doc README.xspice examples/spiceqxl.xorg.conf.example
+%attr(755,root,root) %{_bindir}/xspice
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/spiceqxl_drv.so
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/07/26 19:52:03  qboosh
+- added spice-xserver package
+
 Revision 1.3  2011/07/25 18:51:34  qboosh
 - up to 0.0.16
 - removed obsolete spice patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-qxl/xorg-driver-video-qxl.spec?r1=1.3&r2=1.4&f=u