Merge remote-tracking branch 'origin/master' into f18

.gitignore

@@ -13,3 +13,4 @@
 /spice-gtk-0.13.tar.bz2
 /spice-gtk-0.13.29-f256.tar.bz2
 /spice-gtk-0.14.tar.bz2
+/spice-gtk-0.15.tar.bz2

sources

@@ -1 +1 @@
-c105e3b7f9c9eb293b0d6a8d35f6a5fd  spice-gtk-0.14.tar.bz2
+316ed949e4dfb046a99a9b0c3c9a6e77  spice-gtk-0.15.tar.bz2

spice-gtk.spec

@@ -12,8 +12,8 @@
 #define _version_suffix -f256
 
 Name:           spice-gtk
-Version:        0.14
+Version:        0.15
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A GTK+ widget for SPICE clients
 
 Group:          System Environment/Libraries
@@ -21,27 +21,6 @@ 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-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch
-Patch2:         0002-usb-Add-info-message-when-USB-dialog-is-empty.patch
-Patch3:         0003-Set-channel-state-before-calling-channel_reset.patch
-Patch4:         0004-channel-usbredir-Properly-reset-state-from-reset-cal.patch
-Patch5:         0005-usb-redir-Fix-read-error-handling-depending-on-Spice.patch
-Patch6:         0006-Rename-spice-usbredir-filter-option-to-spice-usbredi.patch
-Patch7:         0007-Add-spice-usbredir-filter-alias-for-spice-usbredir-a.patch
-Patch8:         0008-UsbDeviceManager-Add-a-redirect-on-connect-property.patch
-Patch9:         0009-UsbDeviceManager-Build-channel-list-after-building-t.patch
-Patch10:        0010-UsbDeviceManager-Hookup-redirect-on-connect-property.patch
-Patch11:        0011-UsbDeviceManager-Don-t-warn-on-EINTR.patch
-Patch12:        0012-Add-a-warning-if-scancode-lookup-failed.patch
-Patch13:        0013-vnc-keymap-fix-incorrect-table-size.patch
-Patch14:        0014-widget-apply-color-conversion-when-creating-image.patch
-Patch15:        0015-spicy-show-the-correct-ungrab-key-combination.patch
-Patch16:        0016-channel-inputs-Fix-sending-00-scancodes-to-guests-wi.patch
-Patch17:        0017-Print-list-of-supported-channels.patch
-Patch18:        0018-channel-improve-debugging-message.patch
-Patch19:        0019-Empty-host-subject-from-qemu-should-only-validate-ho.patch
-Patch20:        0020-Fix-disabling-mouse-acceleration-on-X11.patch
-Patch21:        0021-ssl-verify-use-more-explicit-error-message.patch
 
 BuildRequires: intltool
 BuildRequires: gtk2-devel >= 2.14
@@ -167,30 +146,8 @@ if [ -n '%{?_version_suffix}' ]; then
   mv spice-gtk-%{version}%{?_version_suffix} spice-gtk-%{version}
 fi
 
-pushd spice-gtk-%{version}
+#pushd spice-gtk-%{version}
-%patch1 -p1
+#popd
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-autoreconf -f -i
-popd
 
 %if %{with_gtk3}
 cp -a spice-gtk-%{version} spice-gtk3-%{version}
@@ -309,6 +266,9 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc
 %{_bindir}/spicy-stats
 
 %changelog
+* Fri Dec 21 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.15-2
+- Update to spice-gtk 0.15
+
 * Thu Oct 25 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.14-2
 - Add various upstream patches