- updated to 0.9

- updated builddir,usbredir patches (the first one now only changes python module extension)

Changed files:
    spice-gtk-builddir.patch -> 1.2
    spice-gtk-usbredir.patch -> 1.2
    spice-gtk.spec -> 1.9

diff --git a/spice-gtk-builddir.patch b/spice-gtk-builddir.patch
index d62871f6f3a0fed164ee37a6d26cbcc3d7f77077..71d9f95eedf2d40788d292889017bca2620bb3c6 100644 (file)
--- a/spice-gtk-builddir.patch
+++ b/spice-gtk-builddir.patch
@@ -1,15 +1,11 @@
---- spice-gtk-0.7.159/gtk/Makefile.am.orig     2011-12-22 13:48:49.000000000 +0100
-+++ spice-gtk-0.7.159/gtk/Makefile.am  2012-01-06 08:06:44.283333606 +0100
-@@ -563,10 +563,10 @@
+--- spice-gtk-0.9/gtk/Makefile.am.orig 2012-01-31 14:31:38.000000000 +0100
++++ spice-gtk-0.9/gtk/Makefile.am      2012-02-04 08:30:40.437278387 +0100
+@@ -549,7 +549,7 @@
  DEFSDIR = `pkg-config --variable=defsdir pygtk-2.0`
  
  spice-client-gtk.defs: $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS)
--      $(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.py -f spice-client-gtk-manual.defs $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) > $@
-+      $(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.pyc -f $(srcdir)/spice-client-gtk-manual.defs $$(for f in $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) ; do if test -f $$f ; then echo $$f ; else echo $(srcdir)/$$f ; fi ; done) > $@
+-      $(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.py \
++      $(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.pyc \
+               -f $(srcdir)/spice-client-gtk-manual.defs \
+               $^ > $@
  
- spice-client-gtk-module.defs.c: spice-client-gtk.override spice-client-gtk.defs spice-client-gtk-manual.defs
--      @cat $(srcdir)/spice-client-gtk.defs $(srcdir)/spice-client-gtk-manual.defs > tmp.defs
-+      @cat spice-client-gtk.defs $(srcdir)/spice-client-gtk-manual.defs > tmp.defs
-       $(AM_V_GEN)pygobject-codegen-2.0 --prefix spice \
-                         --register $(DEFSDIR)/gdk-types.defs \
-                         --register $(DEFSDIR)/gtk-types.defs \

diff --git a/spice-gtk-usbredir.patch b/spice-gtk-usbredir.patch
index d651ff97156e015f6004fa3c34c3bfb5ec74eab9..9fba896f63137b801f4f5b716ac0ba25ff90a495 100644 (file)
--- a/spice-gtk-usbredir.patch
+++ b/spice-gtk-usbredir.patch
@@ -1,12 +1,12 @@
 For usbredirfilter_string_to_rules()
---- spice-gtk-0.8/configure.ac.orig    2012-01-18 16:57:54.759116620 +0100
-+++ spice-gtk-0.8/configure.ac 2012-01-18 17:20:01.155827699 +0100
-@@ -330,7 +330,7 @@
+--- spice-gtk-0.9/configure.ac.orig    2012-02-04 08:31:07.000000000 +0100
++++ spice-gtk-0.9/configure.ac 2012-02-04 12:03:50.651039985 +0100
+@@ -344,7 +344,7 @@
+   AM_CONDITIONAL(WITH_USBREDIR, false)
  else
-   PKG_CHECK_MODULES(GUDEV, gudev-1.0)
-   PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.9)
--  PKG_CHECK_MODULES(LIBUSBREDIRHOST, libusbredirhost >= 0.3.3)
-+  PKG_CHECK_MODULES(LIBUSBREDIRHOST, libusbredirhost >= 0.3.3 libusbredirparser >= 0.3.3)
-   AC_DEFINE(USE_USBREDIR, [1], [Define if supporting usbredir proxying])
-   AM_CONDITIONAL(WITH_USBREDIR, true)
-   if test "x$enable_polkit" = "xno"; then
+   PKG_CHECK_MODULES([USBREDIR],
+-                    [gudev-1.0 libusb-1.0 >= 1.0.9 libusbredirhost >= 0.3.3],
++                    [gudev-1.0 libusb-1.0 >= 1.0.9 libusbredirhost >= 0.3.3 libusbredirparser >= 0.3.3],
+                     [have_usbredir=yes],
+                     [have_usbredir=no])
+   if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then

diff --git a/spice-gtk.spec b/spice-gtk.spec
index 4beb49034613be64a70e6fdf1539a5051f50e705..65acc97d5c55cb6c1b27c44ecb2e3bea853276c9 100644 (file)
--- a/spice-gtk.spec
+++ b/spice-gtk.spec
@@ -8,12 +8,12 @@
 Summary:       A GTK+ client and libraries for SPICE remote desktop servers
 Summary(pl.UTF-8):     Klient i biblioteki GTK+ dla serwerów zdalnych pulpitów SPICE
 Name:          spice-gtk
-Version:       0.8
+Version:       0.9
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Applications
 Source0:       http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
-# Source0-md5: 761b6c3d74d962d437bdd72f54292498
+# Source0-md5: 29dd7372ac099aedb4d024fc4eacd374
 Patch0:                %{name}-sh.patch
 Patch1:                %{name}-builddir.patch
 Patch2:                %{name}-usbredir.patch
@@ -23,6 +23,7 @@ BuildRequires:        automake >= 1.6
 BuildRequires: cairo-devel >= 1.2.0
 BuildRequires: celt051-devel >= 0.5.1.1
 BuildRequires: cyrus-sasl-devel >= 2.0
+BuildRequires: gcc >= 5:3.0
 BuildRequires: gettext-devel >= 0.17
 BuildRequires: gobject-introspection-devel >= 0.9.4
 BuildRequires: glib2-devel >= 1:2.22
@@ -245,7 +246,6 @@ Interfejs języka Vala do biblioteki klienckiej SPICE.
 mkdir %{?with_gtk2:gtk2} %{?with_gtk3:gtk3}
 
 %build
-%{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4