[packages/spice-gtk] - updated to 0.15 - removed obsolete usbredir patch - added am patch (fixes build with automake 1.13

qboosh qboosh at pld-linux.org
Fri Jan 4 18:15:43 CET 2013


commit 816840367ff5ef0e08edf6153c5032fee2ff6220
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jan 4 18:15:41 2013 +0100

    - updated to 0.15
    - removed obsolete usbredir patch
    - added am patch (fixes build with automake 1.13)

 spice-gtk-am.patch       | 11 +++++++++++
 spice-gtk-usbredir.patch | 11 -----------
 spice-gtk.spec           | 17 +++++++----------
 3 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/spice-gtk.spec b/spice-gtk.spec
index d7dd08d..f7331ba 100644
--- a/spice-gtk.spec
+++ b/spice-gtk.spec
@@ -8,15 +8,15 @@
 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.14
-Release:	2
+Version:	0.15
+Release:	1
 License:	LGPL v2.1+
 Group:		X11/Applications
 Source0:	http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
-# Source0-md5:	c105e3b7f9c9eb293b0d6a8d35f6a5fd
+# Source0-md5:	316ed949e4dfb046a99a9b0c3c9a6e77
 Patch0:		%{name}-sh.patch
 Patch1:		%{name}-builddir.patch
-Patch2:		%{name}-usbredir.patch
+Patch2:		%{name}-am.patch
 URL:		http://spice-space.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.6
@@ -26,7 +26,7 @@ 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
+BuildRequires:	glib2-devel >= 1:2.26
 BuildRequires:	gtk-doc >= 1.14
 %{?with_gtk2:BuildRequires:	gtk+2-devel >= 2:2.18.0}
 %{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0}
@@ -110,7 +110,7 @@ Summary:	SPICE Client GLib library
 Summary(pl.UTF-8):	Biblioteka kliencka SPICE GLib
 Group:		Libraries
 Requires:	celt051 >= 0.5.1.1
-Requires:	glib2 >= 1:2.22
+Requires:	glib2 >= 1:2.26
 %{?with_smartcard:Requires:	libcacard >= 0.1.2}
 Requires:	pixman >= 0.17.7
 %if %{with usbredir}
@@ -130,7 +130,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki klienckiej SPICE GLib
 Group:		Development/Libraries
 Requires:	celt051-devel >= 0.5.1.1
 Requires:	cyrus-sasl-devel >= 2.0
-Requires:	glib2-devel >= 1:2.22
+Requires:	glib2-devel >= 1:2.26
 %{?with_smartcard:Requires:	libcacard-devel >= 0.1.2}
 Requires:	libjpeg-devel
 Requires:	openssl-devel
@@ -245,9 +245,6 @@ Interfejs języka Vala do biblioteki klienckiej SPICE.
 %patch1 -p1
 %patch2 -p1
 
-# kill am portability warning (there is -Werror)
-sed -i -e '/AC_PROG_LIBTOOL/aAM_PROG_AR' configure.ac
-
 mkdir %{?with_gtk2:gtk2} %{?with_gtk3:gtk3}
 
 %build
diff --git a/spice-gtk-am.patch b/spice-gtk-am.patch
new file mode 100644
index 0000000..41cec24
--- /dev/null
+++ b/spice-gtk-am.patch
@@ -0,0 +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 at lists.freedesktop.org])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR([build-aux])
+ 
+ AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror])
diff --git a/spice-gtk-usbredir.patch b/spice-gtk-usbredir.patch
deleted file mode 100644
index e2d7d45..0000000
--- a/spice-gtk-usbredir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spice-gtk-0.14/configure.ac.orig	2012-09-29 20:55:13.459334502 +0200
-+++ spice-gtk-0.14/configure.ac	2012-09-29 21:54:59.519259756 +0200
-@@ -351,7 +351,7 @@
-   have_usbredir="no"
- else
-   PKG_CHECK_MODULES([USBREDIR],
--                    [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
-+                    [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser-0.5 >= 0.4],
-                     [have_usbredir=yes],
-                     [have_usbredir=no])
-   if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/spice-gtk.git/commitdiff/816840367ff5ef0e08edf6153c5032fee2ff6220



More information about the pld-cvs-commit mailing list