[Spice-commits] Branch '0.8' - 3 commits - NEWS client/x11 configure.ac server/spice.h

[Hans de Goede]

 NEWS                   |    9 +++++++++
 client/x11/Makefile.am |    2 ++
 configure.ac           |   19 +++++++++++++------
 server/spice.h         |    2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit 50a4db17107a65d6e2efc39ce64747ed60464d1e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jan 19 15:04:56 2011 +0100

    Release 0.7.2

diff --git a/NEWS b/NEWS
index 1a6c242..8e2e1e0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Major changes in 0.7.2:
+=======================
+* cmd-line-parser: fix wrong reporting of bad argument in --bla=val case
+* Server: do not depend on libcacard and CEGUI (when enabled for the client)
+* Server: send 1 instead of 4 as topdown flag "true" value
+* Client: accept 4 as top down flag value for compatibility with older servers
+* Client: stop blinking keyboard when out of focus
+* Client: log subject-host mismatch, and raise ssl warnings to errors
+
 Major changes in 0.7.1:
 =======================
 * Brown paper bag release
diff --git a/configure.ac b/configure.ac
index 8bd878b..3d62568 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
 
 m4_define([SPICE_MAJOR], 0)
 m4_define([SPICE_MINOR], 7)
-m4_define([SPICE_MICRO], 1)
+m4_define([SPICE_MICRO], 2)
 
 AC_INIT(spice, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice)
 
diff --git a/server/spice.h b/server/spice.h
index 6fb22a4..7265c0f 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <sys/socket.h>
 
-#define SPICE_SERVER_VERSION 0x000701 /* release 0.7.1 */
+#define SPICE_SERVER_VERSION 0x000702 /* release 0.7.2 */
 
 /* interface base type */
 
commit 09a40fabf25e81d48248cd51fef5bff84093cb1c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jan 19 15:00:51 2011 +0100

    server: remove dep on CEGUI

diff --git a/configure.ac b/configure.ac
index f9e85be..8bd878b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,14 +167,12 @@ if test "x$use_gui" = "xyes"; then
     [
         AC_SUBST(CEGUI06_CFLAGS)
         AC_SUBST(CEGUI06_LIBS)
-        SPICE_REQUIRES+=" CEGUI-0.6"
         CEGUI06_CFLAGS+="-DUSE_GUI"
     ],
     [
         PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0)
         AC_SUBST(CEGUI_CFLAGS)
         AC_SUBST(CEGUI_LIBS)
-        SPICE_REQUIRES+=" CEGUI"
         CEGUI_CFLAGS+="-DUSE_GUI"
     ])
 fi
commit fafda4f588157c5ac7759e9455d0362a03bcac2c
Author: Alon Levy <alevy at redhat.com>
Date:   Wed Jan 5 15:02:30 2011 +0200

    client: CEGUI: search for CEGUI-0.6 to work in F15 (rawhide)

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 42b8b0a..7504833 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -25,6 +25,7 @@ INCLUDES = \
 	$(XFIXES_CFLAGS)				\
 	$(MISC_X_CFLAGS)				\
 	$(CEGUI_CFLAGS)					\
+	$(CEGUI06_CFLAGS)					\
 	$(WARN_CFLAGS)                                  \
 	$(SPICE_NONPKGCONFIG_CFLAGS)			\
 	$(SMARTCARD_CFLAGS)				\
@@ -206,6 +207,7 @@ spicec_LDFLAGS = \
 	$(CELT051_LIBS)					\
 	$(SSL_LIBS)					\
 	$(CEGUI_LIBS)					\
+	$(CEGUI06_LIBS)					\
 	$(JPEG_LIBS)					\
 	$(Z_LIBS)					\
 	$(SMARTCARD_LIBS)				\
diff --git a/configure.ac b/configure.ac
index ed0d989..f9e85be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,11 +163,20 @@ AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func,[The POSIX RT yield functi
 SPICE_REQUIRES=""
 
 if test "x$use_gui" = "xyes"; then
-    PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0)
-    AC_SUBST(CEGUI_CFLAGS)
-    AC_SUBST(CEGUI_LIBS)
-    SPICE_REQUIRES+=" CEGUI"
-    CEGUI_CFLAGS+="-DUSE_GUI"
+    PKG_CHECK_MODULES(CEGUI06, CEGUI-0.6 >= 0.6.0 CEGUI-0.6 < 0.7.0,
+    [
+        AC_SUBST(CEGUI06_CFLAGS)
+        AC_SUBST(CEGUI06_LIBS)
+        SPICE_REQUIRES+=" CEGUI-0.6"
+        CEGUI06_CFLAGS+="-DUSE_GUI"
+    ],
+    [
+        PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0)
+        AC_SUBST(CEGUI_CFLAGS)
+        AC_SUBST(CEGUI_LIBS)
+        SPICE_REQUIRES+=" CEGUI"
+        CEGUI_CFLAGS+="-DUSE_GUI"
+    ])
 fi
 
 if test "x$have_tunnel" = "xyes"; then