Update to the spice-gtk 0.13.29 development release

- Rebuild for new usbredir

.gitignore

@@ -11,3 +11,4 @@
 /spice-gtk-0.12.tar.bz2
 /spice-gtk-0.12.101.tar.bz2
 /spice-gtk-0.13.tar.bz2
+/spice-gtk-0.13.29-f256.tar.bz2

0001-G_GNUC_DEPRECATED_FOR-must-be-defined-publicly.patch

@@ -0,0 +1,72 @@
+From 6fb336e5218e85ca20010ba1f36092dcef955d92 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Tue, 4 Sep 2012 23:27:05 +0200
+Subject: [PATCH spice-gtk] G_GNUC_DEPRECATED_FOR must be defined publicly
+
+It's not enough to define G_GNUC_DEPRECATED_FOR in glib-compat.h,
+since this header is no public. Instead, let's define our own
+SPICE_DEPRECATED_FOR macro
+---
+ gtk/glib-compat.h | 16 ----------------
+ gtk/spice-util.h  | 12 +++++++++++-
+ 2 files changed, 11 insertions(+), 17 deletions(-)
+
+diff --git a/gtk/glib-compat.h b/gtk/glib-compat.h
+index a9efda3..909b4e1 100644
+--- a/gtk/glib-compat.h
++++ b/gtk/glib-compat.h
+@@ -67,13 +67,6 @@ type_name##_get_type (void) \
+ #define G_TYPE_ERROR (spice_error_get_type ())
+ GType spice_error_get_type (void) G_GNUC_CONST;
+ 
+-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+-#define G_GNUC_DEPRECATED_FOR(f)                        \
+-  __attribute__((deprecated("Use " #f " instead")))
+-#else
+-#define G_GNUC_DEPRECATED_FOR(f)        G_GNUC_DEPRECATED
+-#endif /* __GNUC__ */
+-
+ #define G_PARAM_DEPRECATED  (1 << 31)
+ #endif /* glib 2.26 */
+ 
+@@ -126,13 +119,4 @@ GType spice_main_context_get_type (void) G_GNUC_CONST;
+   } G_STMT_END
+ #endif
+ 
+-#ifndef G_GNUC_DEPRECATED_FOR
+-#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+-#define G_GNUC_DEPRECATED_FOR(f)                        \
+-  __attribute__((deprecated("Use " #f " instead")))
+-#else
+-#define G_GNUC_DEPRECATED_FOR(f)        G_GNUC_DEPRECATED
+-#endif /* __GNUC__ */
+-#endif
+-
+ #endif /* GLIB_COMPAT_H */
+diff --git a/gtk/spice-util.h b/gtk/spice-util.h
+index 271f3be..6996e55 100644
+--- a/gtk/spice-util.h
++++ b/gtk/spice-util.h
+@@ -39,8 +39,18 @@ gulong spice_g_signal_connect_object(gpointer instance,
+ 
+ #define SPICE_RESERVED_PADDING (10 * sizeof(void*))
+ 
++/* need to be in a public header, glib-compat.h is private */
++#ifndef SPICE_GNUC_DEPRECATED_FOR
++#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
++#define SPICE_GNUC_DEPRECATED_FOR(f)                        \
++  __attribute__((deprecated("Use " #f " instead")))
++#else
++#define SPICE_GNUC_DEPRECATED_FOR(f)        G_GNUC_DEPRECATED
++#endif /* __GNUC__ */
++#endif
++
+ #ifndef SPICE_NO_DEPRECATED
+-#define SPICE_DEPRECATED_FOR(f)  G_GNUC_DEPRECATED_FOR(f)
++#define SPICE_DEPRECATED_FOR(f)  SPICE_GNUC_DEPRECATED_FOR(f)
+ #define SPICE_DEPRECATED  G_GNUC_DEPRECATED
+ #else
+ #define SPICE_DEPRECATED_FOR(f)
+-- 
+1.7.11.4
+

sources

@@ -1 +1 @@
-97ed79c9df1ad0997e605c22a7ce47c7  spice-gtk-0.13.tar.bz2
+4296bc9e8e7afe629fc9ca7cc48f84a3  spice-gtk-0.13.29-f256.tar.bz2

spice-gtk.spec

@@ -9,10 +9,10 @@
 %define with_gtk3 1
 %endif
 
-#define _version_suffix -ab64
+%define _version_suffix -f256
 
 Name:           spice-gtk
-Version:        0.13
+Version:        0.13.29
 Release:        1%{?dist}
 Summary:        A GTK+ widget for SPICE clients
 
@@ -21,10 +21,11 @@ License:        LGPLv2+
 URL:            http://spice-space.org/page/Spice-Gtk
 #VCS:           git:git://anongit.freedesktop.org/spice/spice-gtk
 Source0:        http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
+Patch1:         0001-G_GNUC_DEPRECATED_FOR-must-be-defined-publicly.patch
 
 BuildRequires: intltool
 BuildRequires: gtk2-devel >= 2.14
-BuildRequires: usbredir-devel >= 0.4
+BuildRequires: usbredir-devel >= 0.5
 BuildRequires: libusb1-devel >= 1.0.9
 BuildRequires: libgudev1-devel
 BuildRequires: perl-Text-CSV
@@ -146,6 +147,10 @@ if [ -n '%{?_version_suffix}' ]; then
   mv spice-gtk-%{version}%{?_version_suffix} spice-gtk-%{version}
 fi
 
+pushd spice-gtk-%{version}
+%patch1 -p1
+popd
+
 %if %{with_gtk3}
 cp -a spice-gtk-%{version} spice-gtk3-%{version}
 %endif
@@ -263,6 +268,10 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc
 %{_bindir}/spicy-stats
 
 %changelog
+* Fri Sep  7 2012 Hans de Goede <hdegoede@redhat.com> - 0.13.29-1
+- Update to the spice-gtk 0.13.29 development release
+- Rebuild for new usbredir
+
 * Mon Sep 03 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.13-2
 - Update to spice-gtk 0.13