$ git diff --patch-with-stat --summary 905518854e8d22fb6c121a1c9e0a0fc1a986124d..3ec9ebe838746dd4f6de12e2e92c1a4c3b8e1513

 .abf.yml       |  4 +++-
 spice-gtk.spec | 50 +++++++++++++++++++++-----------------------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 39b0a4d..6f6a588 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
+removed_sources:
+  spice-gtk-0.35.tar.bz2: ce859f77e625928a147b7ae73e5af45166861d16
 sources:
-  spice-gtk-0.32.tar.bz2: 488427ffd2ab42a2ede62ecb393417af691d1a88
+  spice-gtk-0.36.tar.bz2: 9ef3359817a143cd2209d72dd058536ad183413d
diff --git a/spice-gtk.spec b/spice-gtk.spec
index 02581d5..107063c 100644
--- a/spice-gtk.spec
+++ b/spice-gtk.spec
@@ -8,14 +8,12 @@
 %define gtkmajor	5
 %define libgtk		%mklibname spice-client-gtk %{gtkapi} %{gtkmajor}
 %define gtkgir		%mklibname spice-client-gtk-gir %{gtkapi}
-%define controllermajor	0
-%define libcontroller	%mklibname spice-controller %{controllermajor}
 %define develname	%mklibname -d %{name}
 
 %define _disable_rebuild_configure 1
 
 Name:		spice-gtk
-Version:	0.32
+Version:	0.36
 Release:	1
 Summary:	A GTK client widget for accessing SPICE desktop servers
 Group:		Networking/Remote access
@@ -23,16 +21,22 @@ URL:		http://spice-space.org/page/Spice-Gtk
 License:	LGPLv2+
 Source0:	http://www.spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
 BuildRequires:	pkgconfig(cairo) >= 1.2.0
-BuildRequires:	pkgconfig(celt051) >= 0.5.1.1
 BuildRequires:	pkgconfig(gio-2.0) >= 2.10.0
 BuildRequires:	pkgconfig(glib-2.0) >= 2.22
 BuildRequires:	pkgconfig(gobject-2.0)
 BuildRequires:	pkgconfig(gobject-introspection-1.0) >= 0.9.4
+BuildRequires:	pkgconfig(gstreamer-1.0)
+BuildRequires:	pkgconfig(gstreamer-base-1.0)
+BuildRequires:	pkgconfig(gstreamer-app-1.0)
+BuildRequires:	pkgconfig(gstreamer-audio-1.0)
+BuildRequires:	pkgconfig(gstreamer-video-1.0)
 BuildRequires:	pkgconfig(gthread-2.0) > 2.0.0
 BuildRequires:	pkgconfig(gtk+-3.0) >= 2.91.3
 BuildRequires:	pkgconfig(gtk+-x11-3.0)
 BuildRequires:	pkgconfig(gudev-1.0)
-BuildRequires:	pkgconfig(libcacard) >= 0.1.2
+BuildRequires:	pkgconfig(json-glib-1.0)
+BuildRequires:	pkgconfig(libcacard) >= 2.5.1
+BuildRequires:	pkgconfig(liblz4)
 BuildRequires:	pkgconfig(libpulse)
 BuildRequires:	pkgconfig(libpulse-mainloop-glib)
 BuildRequires:	pkgconfig(libsoup-2.4)
@@ -40,11 +44,13 @@ BuildRequires:	pkgconfig(libusb-1.0) >= 1.0.9
 BuildRequires:	pkgconfig(libusbredirhost) >= 0.3.3
 BuildRequires:	pkgconfig(libusbredirparser-0.5)
 BuildRequires:	pkgconfig(openssl)
+BuildRequires:	pkgconfig(opus)
 BuildRequires:	pkgconfig(pixman-1) >= 0.17.7
 BuildRequires:	pkgconfig(polkit-gobject-1)
-BuildRequires:	pkgconfig(spice-protocol) >= 0.10.1
+BuildRequires:	pkgconfig(spice-protocol) >= 0.12.14
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(xrandr)
+BuildRequires:	acl-devel
 BuildRequires:	gtk-doc >= 1.14
 BuildRequires:	sasl-devel
 BuildRequires:	jpeg-devel
@@ -59,12 +65,12 @@ BuildRequires:	vala
 BuildRequires:	vala-tools
 %endif
 
-%track
-prog %name = {
-	url = http://www.spice-space.org/download/gtk/
-	regex = %name-(__VER__)\.tar\.bz2
-	version = %version
-}
+#track
+#prog %name = {
+#	url = http://www.spice-space.org/download/gtk/
+#	regex = %name-(__VER__)\.tar\.bz2
+#	version = %version
+#}
 
 %description
 Spice-GTK is a GTK client widget for accessing SPICE desktop 
@@ -107,20 +113,11 @@ Conflicts: %{_lib}spice-gtk3.0_1 < 0.7.81-2
 %description -n %{gtkgir}
 GObject introspection interface library for %{name}.
 
-%package -n %{libcontroller}
-Summary: Runtime libraries for %{name}
-Group: System/Libraries
-Conflicts: %{_lib}spice-gtk3.0_1 < 0.7.81-2
-
-%description -n %{libcontroller}
-Runtime libraries for %{name}.
-
 %package -n %{develname}
 Summary: Development files for %{name}
 Group: Development/C
 Requires: %{libglib} = %{version}-%{release}
 Requires: %{libgtk} = %{version}-%{release}
-Requires: %{libcontroller} = %{version}-%{release}
 Provides: %{name}-devel = %{version}-%{release}
 Obsoletes: %{_lib}spice-gtk3.0-devel < 0.7.81-2
 
@@ -133,6 +130,9 @@ Development files for %{name}.
 %build
 %configure \
 	--with-gtk=%{gtkapi} \
+	--enable-polkit \
+	--disable-celt051 \
+	--enable-smartcard \
 %if %{build_vala}
 	--enable-vala \
 %else
@@ -179,25 +179,17 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
 %files -n %{gtkgir}
 %{_libdir}/girepository-1.0/SpiceClientGtk-%{gtkapi}.typelib
 
-%files -n %{libcontroller}
-%{_libdir}/libspice-controller.so.%{controllermajor}
-%{_libdir}/libspice-controller.so.%{controllermajor}.*
-
 %files -n %{develname}
 %doc %{_datadir}/gtk-doc/html/spice-gtk
 %{_includedir}/spice-client-glib-2.0
 %{_includedir}/spice-client-gtk-3.0/
-%{_includedir}/spice-controller/
 %{_libdir}/libspice-client-glib-2.0.so
 %{_libdir}/libspice-client-gtk-3.0.so
-%{_libdir}/libspice-controller.so
 %{_libdir}/pkgconfig/spice-client-glib-2.0.pc
 %{_libdir}/pkgconfig/spice-client-gtk-3.0.pc
-%{_libdir}/pkgconfig/spice-controller.pc
 %{_datadir}/gir-1.0/SpiceClientGLib-2.0.gir
 %{_datadir}/gir-1.0/SpiceClientGtk-3.0.gir
 %if %{build_vala}
-%{_datadir}/vala/vapi/spice-protocol.vapi
 %{_datadir}/vala/vapi/spice-client-glib-%{glibapi}.deps
 %{_datadir}/vala/vapi/spice-client-glib-%{glibapi}.vapi
 %{_datadir}/vala/vapi/spice-client-gtk-%{gtkapi}.deps