From 2c2848a9c4c424f23ccf36cd3744e12ab11f53ae Mon Sep 17 00:00:00 2001
From: Uri Lublin <uril@redhat.com>
Date: Fri, 1 Jun 2012 14:08:56 +0200
Subject: [PATCH] Add upstream patch improving --disable-client

---
 ...spice-configure-cleanup-client-build.patch | 92 +++++++++++++++++++
 spice.spec                                    |  4 +
 2 files changed, 96 insertions(+)
 create mode 100644 0009-spice-configure-cleanup-client-build.patch

diff --git a/0009-spice-configure-cleanup-client-build.patch b/0009-spice-configure-cleanup-client-build.patch
new file mode 100644
index 0000000..4b9e29f
--- /dev/null
+++ b/0009-spice-configure-cleanup-client-build.patch
@@ -0,0 +1,92 @@
+From c3eae628725012678b7141b49b0a15b8718ea9b3 Mon Sep 17 00:00:00 2001
+From: Nahum Shalman <nshalman@elys.com>
+Date: Thu, 3 May 2012 12:32:19 -0400
+Subject: [PATCH] cleanup x11 library detection for building client
+
+Consolidate two separate chunks of library hunting that depend on the
+same check.
+
+Check if we're actually building the client before looking for
+client only libraries.
+
+Hide some of the final output if we're not building the client.
+---
+ configure.ac |   21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4b24c7d..66f9d12 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,7 +183,7 @@ AC_DEFINE_UNQUOTED([POSIX_YIELD_FUNC],$posix_yield_func,[The POSIX RT yield func
+ 
+ SPICE_REQUIRES=""
+ 
+-if test "x$enable_gui" = "xyes"; then
++if test "x$enable_gui" = "xyes" && test "x$enable_client" = "xyes" ; then
+     PKG_CHECK_MODULES(CEGUI06, CEGUI-0.6 >= 0.6.0 CEGUI-0.6 < 0.7.0,
+     [
+         AC_SUBST(CEGUI06_CFLAGS)
+@@ -254,7 +254,7 @@ SPICE_REQUIRES+=" openssl"
+ # AC_SUBST(GL_LIBS)
+ # SPICE_REQUIRES+=" gl glu"
+ 
+-if test "x$enable_opengl" = "xyes"; then
++if test "x$enable_opengl" = "xyes" && test "x$enable_client" = "xyes" ; then
+    AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
+    AC_CHECK_LIB(GLU, gluSphere, GL_LIBS="$GL_LIBS -lGLU", enable_opengl=no)
+    AC_DEFINE([USE_OPENGL], [1], [Define to build with OpenGL support])
+@@ -269,11 +269,14 @@ AC_SUBST(GL_CFLAGS)
+ AC_SUBST(GL_LIBS)
+ SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS"
+ 
+-if test "$red_target" = "x11"; then
++if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then
+ 	PKG_CHECK_MODULES(XRANDR, xrandr)
+ 	PKG_CHECK_MODULES(XFIXES, xfixes)
++	PKG_CHECK_MODULES(MISC_X, x11 xext xrender)
+ 	AC_SUBST(XRANDR_CFLAGS)
+ 	AC_SUBST(XRANDR_LIBS)
++	AC_SUBST(MISC_X_CFLAGS)
++	AC_SUBST(MISC_X_LIBS)
+ 
+ 	PKG_CHECK_MODULES(XRANDR12,
+ 	        xrandr >= 1.2,
+@@ -288,12 +291,6 @@ if test "x$have_xrandr12" = "xyes" ; then
+   AC_DEFINE([HAVE_XRANDR12], [], [Define if we have XRANDR 12])
+ fi
+ 
+-if test "$red_target" = "x11"; then
+-	PKG_CHECK_MODULES(MISC_X, x11 xext xrender)
+-	AC_SUBST(MISC_X_CFLAGS)
+-	AC_SUBST(MISC_X_LIBS)
+-fi
+-
+ PKG_CHECK_MODULES(XINERAMA,
+         xinerama >= 1.0,
+         have_xinerama=yes,
+@@ -485,18 +482,18 @@ echo "
+         python:                   ${PYTHON}
+ 
+         Build Spice client:       ${enable_client}
+-
++" ; if test "x$enable_client" == "xyes"; then echo "\
+         Have XRANDR 1.2:          ${have_xrandr12}
+ 
+         Have Xinerama:            ${have_xinerama}
+ 
+-        Support tunneling:        ${enable_tunnel}
+-
+         Red target:               ${red_target}
+ 
+         OpenGL:                   ${enable_opengl}
+ 
+         GUI:                      ${enable_gui}
++" ; fi ; echo "\
++        Support tunneling:        ${enable_tunnel}
+ 
+         Smartcard:                ${enable_smartcard}
+ 
+-- 
+1.7.10.2
+
diff --git a/spice.spec b/spice.spec
index d400e5a..e7c38da 100644
--- a/spice.spec
+++ b/spice.spec
@@ -15,6 +15,7 @@ Patch4:         0005-server-red_worker-don-t-release-self_bitmap-unless-r.patch
 Patch5:         0006-server-reds-add-usbredir-to-recognized-channel-names.patch
 Patch6:         0007-server-mjpeg_encoder-Fix-memory-leak-for-the-inital-.patch
 Patch7:         0008-server-mjpeg_encoder-fix-wrong-size-assigned-to-dest.patch
+Patch8:         0009-spice-configure-cleanup-client-build.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=613529
 ExclusiveArch:  i686 x86_64
@@ -25,6 +26,7 @@ BuildRequires:  celt051-devel
 BuildRequires:  pixman-devel alsa-lib-devel openssl-devel libjpeg-devel
 BuildRequires:  libXrandr-devel cegui06-devel
 BuildRequires:  libcacard-devel cyrus-sasl-devel
+BuildRequires:  autoconf automake libtool
 
 %description
 The Simple Protocol for Independent Computing Environments (SPICE) is
@@ -83,8 +85,10 @@ using spice-server, you will need to install spice-server-devel.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
+autoreconf -fi
 %configure --enable-gui --enable-smartcard
 make WARN_CFLAGS='' %{?_smp_mflags}