- updated to 0.18

- removed obsolete sh patch
- old am patch obsolete; added new one to disable -Werror am flag (gtk-doc suite causes non-portability warning)

diff --git a/spice-gtk-am.patch b/spice-gtk-am.patch
index 41cec249070e4e3e1db2ef452dc47adf18b90069..d9cf7af209e9ea80f0ebbd27a1f12f4fc57391c3 100644 (file)
--- a/spice-gtk-am.patch
+++ b/spice-gtk-am.patch
@@ -1,11 +1,11 @@
---- spice-gtk-0.15/configure.ac.orig   2013-01-04 17:13:10.694722716 +0100
-+++ spice-gtk-0.15/configure.ac        2013-01-04 17:45:16.591349240 +0100
-@@ -4,7 +4,7 @@
-         [spice-devel@lists.freedesktop.org])
- 
- AC_CONFIG_MACRO_DIR([m4])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
+--- spice-gtk-0.18/configure.ac.orig   2013-02-06 19:28:42.000000000 +0100
++++ spice-gtk-0.18/configure.ac        2013-02-14 17:31:23.439007540 +0100
+@@ -7,7 +7,7 @@
+ AC_CONFIG_HEADER([config.h])
  AC_CONFIG_AUX_DIR([build-aux])
  
- AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror])
+-AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror])
++AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall])
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ LT_INIT
+ AM_MAINTAINER_MODE

diff --git a/spice-gtk-sh.patch b/spice-gtk-sh.patch
deleted file mode 100644 (file)
index d2f66e0..0000000
--- a/spice-gtk-sh.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- spice-gtk-0.7/configure.ac.orig    2011-07-18 20:28:07.000000000 +0200
-+++ spice-gtk-0.7/configure.ac 2011-07-21 18:49:42.148016898 +0200
-@@ -70,18 +70,18 @@
- PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
- AC_SUBST(PIXMAN_CFLAGS)
- AC_SUBST(PIXMAN_LIBS)
--SPICE_GLIB_REQUIRES+=" pixman-1 >= 0.17.7"
-+SPICE_GLIB_REQUIRES="$SPICE_GLIB_REQUIRES pixman-1 >= 0.17.7"
- 
- PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
- AC_SUBST(CELT051_CFLAGS)
- AC_SUBST(CELT051_LIBS)
- AC_SUBST(CELT051_LIBDIR)
--SPICE_GLIB_REQUIRES+=" celt051 >= 0.5.1.1"
-+SPICE_GLIB_REQUIRES="$SPICE_GLIB_REQUIRES celt051 >= 0.5.1.1"
- 
- PKG_CHECK_MODULES(SSL, openssl)
- AC_SUBST(SSL_CFLAGS)
- AC_SUBST(SSL_LIBS)
--SPICE_GLIB_REQUIRES+=" openssl"
-+SPICE_GLIB_REQUIRES="$SPICE_GLIB_REQUIRES openssl"
- 
- dnl Cyrus SASL
- AC_ARG_WITH([sasl],
-@@ -164,7 +164,7 @@
- PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
--SPICE_GTK_REQUIRES+=" gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
-+SPICE_GTK_REQUIRES="$SPICE_GTK_REQUIRES gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
- 
- PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [have_x11=yes], [have_x11=no])
- AS_IF([test "x$have_x11" = "xyes"], [AC_DEFINE([HAVE_X11], 1, [Have x11?])])

diff --git a/spice-gtk.spec b/spice-gtk.spec
index f65619b21aa00d55cd29213cb3be5b9a5cd3540d..428de9ced55b134b14fd2bf11a43390a9d49473c 100644 (file)
--- a/spice-gtk.spec
+++ b/spice-gtk.spec
@@ -8,15 +8,14 @@
 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.16
+Version:       0.18
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Applications
 Source0:       http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
-# Source0-md5: 1b61697d643f1acc0e2950834dfa78f4
-Patch0:                %{name}-sh.patch
-Patch1:                %{name}-builddir.patch
-Patch2:                %{name}-am.patch
+# Source0-md5: bcd73f857d137bca8e24380e8f7977d2
+Patch0:                %{name}-builddir.patch
+Patch1:                %{name}-am.patch
 URL:           http://spice-space.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.6
@@ -243,7 +242,6 @@ Interfejs języka Vala do biblioteki klienckiej SPICE.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 mkdir %{?with_gtk2:gtk2} %{?with_gtk3:gtk3}