[mingw-spice-gtk] Update to spice-gtk 0.15
Christophe Fergeau
teuf at fedoraproject.org
Fri Dec 21 20:37:06 UTC 2012
commit 39423369d026c0780963cad3840f1ecd72796f8b
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Fri Dec 21 21:36:27 2012 +0100
Update to spice-gtk 0.15
.gitignore | 1 +
0001-mingw-Fix-link-errors.patch | 364 ++++++++++++++++++++++++++++++++++++++
mingw-spice-gtk.spec | 24 ++-
sources | 2 +-
4 files changed, 380 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0891737..b004c50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/spice-gtk-0.12.tar.bz2
+/spice-gtk-0.15.tar.bz2
diff --git a/0001-mingw-Fix-link-errors.patch b/0001-mingw-Fix-link-errors.patch
new file mode 100644
index 0000000..43856f2
--- /dev/null
+++ b/0001-mingw-Fix-link-errors.patch
@@ -0,0 +1,364 @@
+From 845c569f2539c61835e3e71994a3830edc555b16 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Fri, 21 Dec 2012 19:55:01 +0100
+Subject: [spice-gtk] mingw: Fix link errors
+
+Without this patch build fails with:
+
+ CCLD libspice-client-glib-2.0.la
+.libs/spice-channel.o: In function `spice_channel_coroutine':
+/home/teuf/redhat/spice-gtk/gtk/spice-channel.c:2287: undefined reference to `_imp__setsockopt at 20'
+.libs/channel-display.o: In function `create_compatible_dc':
+/home/teuf/redhat/spice-gtk/gtk/channel-display.c:672: undefined reference to `_imp__CreateCompatibleDC at 4'
+../spice-common/common/.libs/libspice-common.a(canvas_utils.o): In function `release_data':
+/home/teuf/redhat/spice-gtk/spice-common/common/canvas_utils.c:41: undefined reference to `_imp__DeleteObject at 4'
+../spice-common/common/.libs/libspice-common.a(canvas_utils.o): In function `surface_create':
+/home/teuf/redhat/spice-gtk/spice-common/common/canvas_utils.c:192: undefined reference to `_imp__CreateDIBSection at 24'
+/home/teuf/redhat/spice-gtk/spice-common/common/canvas_utils.c:208: undefined reference to `_imp__DeleteObject at 4'
+../spice-common/common/.libs/libspice-common.a(ssl_verify.o): In function `inet_aton':
+/home/teuf/redhat/spice-gtk/spice-common/common/ssl_verify.c:38: undefined reference to `_imp__inet_addr at 4'
+../spice-common/common/.libs/libspice-common.a(ssl_verify.o): In function `verify_hostname':
+/home/teuf/redhat/spice-gtk/spice-common/common/ssl_verify.c:216: undefined reference to `_imp__inet_ntoa at 4'
+collect2: error: ld returned 1 exit status
+---
+ gtk/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 5b219a7..176cf20 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -345,6 +345,7 @@ if WITH_USBREDIR
+ libspice_client_glib_2_0_la_SOURCES += \
+ $(WIN_USB_FILES)
+ endif
++libspice_client_glib_2_0_la_LIBADD += -lws2_32 -lgdi32
+ endif
+
+ displaysrc = \
+diff --git a/gtk/Makefile.in b/gtk/Makefile.in
+index e9a4294..6ef41ad 100644
+--- a/gtk/Makefile.in
++++ b/gtk/Makefile.in
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11.6 from Makefile.am.
++# Makefile.in generated by automake 1.12.2 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -91,18 +90,19 @@ bin_PROGRAMS = spicy$(EXEEXT) snappy$(EXEEXT) spicy-stats$(EXEEXT)
+ @OS_WIN32_TRUE@@WITH_USBREDIR_TRUE at am__append_14 = \
+ @OS_WIN32_TRUE@@WITH_USBREDIR_TRUE@ $(WIN_USB_FILES)
+
+- at WITH_DISPLAY_X11_TRUE@am__append_15 = display/gnome-rr-x11.c display/gnome-rr-x11.h
+- at WITH_DISPLAY_WINDOWS_TRUE@@WITH_DISPLAY_X11_FALSE at am__append_16 = display/gnome-rr-windows.c display/gnome-rr-windows.h
+- at WITH_DISPLAY_WINDOWS_FALSE@@WITH_DISPLAY_X11_FALSE at am__append_17 = display/gnome-rr-generic.c display/gnome-rr-generic.h
+- at WITH_PYTHON_TRUE@am__append_18 = spice-client-gtk-module.defs.c spice-client-gtk.defs
+- at HAVE_INTROSPECTION_TRUE@am__append_19 = SpiceClientGLib-2.0.gir \
++ at OS_WIN32_TRUE@am__append_15 = -lws2_32 -lgdi32
++ at WITH_DISPLAY_X11_TRUE@am__append_16 = display/gnome-rr-x11.c display/gnome-rr-x11.h
++ at WITH_DISPLAY_WINDOWS_TRUE@@WITH_DISPLAY_X11_FALSE at am__append_17 = display/gnome-rr-windows.c display/gnome-rr-windows.h
++ at WITH_DISPLAY_WINDOWS_FALSE@@WITH_DISPLAY_X11_FALSE at am__append_18 = display/gnome-rr-generic.c display/gnome-rr-generic.h
++ at WITH_PYTHON_TRUE@am__append_19 = spice-client-gtk-module.defs.c spice-client-gtk.defs
++ at HAVE_INTROSPECTION_TRUE@am__append_20 = SpiceClientGLib-2.0.gir \
+ @HAVE_INTROSPECTION_TRUE@ SpiceClientGtk-$(SPICE_GTK_API_VERSION).gir
+- at HAVE_INTROSPECTION_TRUE@am__append_20 = $(gir_DATA) $(typelibs_DATA)
++ at HAVE_INTROSPECTION_TRUE@am__append_21 = $(gir_DATA) $(typelibs_DATA)
+ subdir = gtk
+ DIST_COMMON = $(dist_libspice_client_glibinclude_DATA) \
+ $(libspice_client_glibinclude_HEADERS) \
+ $(libspice_client_gtkinclude_HEADERS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in
++ $(srcdir)/Makefile.in $(top_srcdir)/build-aux/depcomp
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/check_python.m4 \
+ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/ld-version.m4 \
+@@ -167,6 +167,7 @@ SpiceClientGtk_la_OBJECTS = $(am_SpiceClientGtk_la_OBJECTS) \
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
++am__v_lt_1 =
+ SpiceClientGtk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(SpiceClientGtk_la_CFLAGS) $(CFLAGS) \
+@@ -183,7 +184,8 @@ libspice_client_glib_2_0_la_DEPENDENCIES = \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
++ $(am__DEPENDENCIES_1)
+ am__libspice_client_glib_2_0_la_SOURCES_DIST = bio-gsocket.c \
+ bio-gsocket.h glib-compat.c glib-compat.h spice-audio.c \
+ spice-audio-priv.h spice-common.h spice-util.c \
+@@ -341,6 +343,18 @@ am_spicy_stats_OBJECTS = spicy-stats.$(OBJEXT) spice-cmdline.$(OBJEXT) \
+ spicy_stats_OBJECTS = $(am_spicy_stats_OBJECTS)
+ spicy_stats_DEPENDENCIES = libspice-client-glib-2.0.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++AM_V_P = $(am__v_P_ at AM_V@)
++am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
++am__v_P_0 = false
++am__v_P_1 = :
++AM_V_GEN = $(am__v_GEN_ at AM_V@)
++am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
++am__v_GEN_0 = @echo " GEN " $@;
++am__v_GEN_1 =
++AM_V_at = $(am__v_at_ at AM_V@)
++am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
++am__v_at_0 = @
++am__v_at_1 =
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+ am__depfiles_maybe = depfiles
+@@ -353,20 +367,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_ at AM_V@)
+ am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
+-am__v_CC_0 = @echo " CC " $@;
+-AM_V_at = $(am__v_at_ at AM_V@)
+-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+-am__v_at_0 = @
++am__v_CC_0 = @echo " CC " $@;
++am__v_CC_1 =
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
+-am__v_CCLD_0 = @echo " CCLD " $@;
+-AM_V_GEN = $(am__v_GEN_ at AM_V@)
+-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+-am__v_GEN_0 = @echo " GEN " $@;
++am__v_CCLD_0 = @echo " CCLD " $@;
++am__v_CCLD_1 =
+ SOURCES = $(SpiceClientGtk_la_SOURCES) \
+ $(nodist_SpiceClientGtk_la_SOURCES) \
+ $(libspice_client_glib_2_0_la_SOURCES) \
+@@ -698,7 +708,7 @@ GLIBGENS = \
+ spice-widget-enums.h \
+ $(NULL)
+
+-CLEANFILES = $(GLIBGENS) $(am__append_18) $(am__append_20)
++CLEANFILES = $(GLIBGENS) $(am__append_19) $(am__append_21)
+ BUILT_SOURCES = $(GLIBGENS) $(KEYMAPS)
+ EXTRA_DIST = \
+ $(KEYMAPS) \
+@@ -811,7 +821,8 @@ libspice_client_glib_2_0_la_LIBADD = \
+ $(GLIB2_LIBS) $(GIO_LIBS) $(GOBJECT2_LIBS) $(CELT051_LIBS) \
+ $(JPEG_LIBS) $(Z_LIBS) $(PIXMAN_LIBS) $(SSL_LIBS) \
+ $(PULSE_LIBS) $(GST_LIBS) $(SASL_LIBS) $(SMARTCARD_LIBS) \
+- $(USBREDIR_LIBS) $(GUDEV_LIBS) $(NULL) $(am__append_13)
++ $(USBREDIR_LIBS) $(GUDEV_LIBS) $(NULL) $(am__append_13) \
++ $(am__append_15)
+ @WITH_POLKIT_FALSE at USB_ACL_HELPER_SRCS =
+ @WITH_POLKIT_TRUE at USB_ACL_HELPER_SRCS = \
+ @WITH_POLKIT_TRUE@ usb-acl-helper.c \
+@@ -888,8 +899,8 @@ displaysrc = glib-compat.h display/edid.h display/edid-parse.c \
+ display/display-name.c display/gnome-rr-config.c \
+ display/gnome-rr-config.h display/gnome-rr-output-info.c \
+ display/gnome-rr-private.h display/gnome-rr.c \
+- display/gnome-rr.h $(NULL) $(am__append_15) $(am__append_16) \
+- $(am__append_17)
++ display/gnome-rr.h $(NULL) $(am__append_16) $(am__append_17) \
++ $(am__append_18)
+ spicy_SOURCES = \
+ spicy.c \
+ spice-cmdline.h \
+@@ -967,7 +978,7 @@ spicy_stats_LDADD = \
+ @WITH_PYTHON_TRUE at DEFSDIR = `pkg-config --variable=defsdir pygtk-2.0`
+ @G_IR_SCANNER_SYMBOL_PREFIX_FALSE at PREFIX_ARGS = --strip-prefix=Spice
+ @G_IR_SCANNER_SYMBOL_PREFIX_TRUE at PREFIX_ARGS = --symbol-prefix=spice --identifier-prefix=Spice
+-INTROSPECTION_GIRS = $(am__append_19)
++INTROSPECTION_GIRS = $(am__append_20)
+ INTROSPECTION_SCANNER_ARGS = --warn-all --accept-unprefixed --add-include-path=$(builddir) $(PREFIX_ARGS)
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
+ @HAVE_INTROSPECTION_TRUE at glib_introspection_files = \
+@@ -1084,12 +1095,14 @@ uninstall-libLTLIBRARIES:
+
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
+- echo "rm -f \"$${dir}/so_locations\""; \
+- rm -f "$${dir}/so_locations"; \
+- done
++ @list='$(lib_LTLIBRARIES)'; \
++ locs=`for p in $$list; do echo $$p; done | \
++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
++ sort -u`; \
++ test -z "$$locs" || { \
++ echo rm -f $${locs}; \
++ rm -f $${locs}; \
++ }
+ install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(pyexec_LTLIBRARIES)'; test -n "$(pyexecdir)" || list=; \
+@@ -1116,12 +1129,14 @@ uninstall-pyexecLTLIBRARIES:
+
+ clean-pyexecLTLIBRARIES:
+ -test -z "$(pyexec_LTLIBRARIES)" || rm -f $(pyexec_LTLIBRARIES)
+- @list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
+- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+- test "$$dir" != "$$p" || dir=.; \
+- echo "rm -f \"$${dir}/so_locations\""; \
+- rm -f "$${dir}/so_locations"; \
+- done
++ @list='$(pyexec_LTLIBRARIES)'; \
++ locs=`for p in $$list; do echo $$p; done | \
++ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
++ sort -u`; \
++ test -z "$$locs" || { \
++ echo rm -f $${locs}; \
++ rm -f $${locs}; \
++ }
+ SpiceClientGtk.la: $(SpiceClientGtk_la_OBJECTS) $(SpiceClientGtk_la_DEPENDENCIES) $(EXTRA_SpiceClientGtk_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(SpiceClientGtk_la_LINK) $(am_SpiceClientGtk_la_rpath) $(SpiceClientGtk_la_OBJECTS) $(SpiceClientGtk_la_LIBADD) $(LIBS)
+ libspice-client-glib-2.0.la: $(libspice_client_glib_2_0_la_OBJECTS) $(libspice_client_glib_2_0_la_DEPENDENCIES) $(EXTRA_libspice_client_glib_2_0_la_DEPENDENCIES)
+@@ -1672,12 +1687,12 @@ uninstall-nodist_libspice_client_gtkincludeHEADERS:
+ dir='$(DESTDIR)$(libspice_client_gtkincludedir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+-# into them and run `make' without going through this Makefile.
+-# To change the values of `make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in `config.status', edit `config.status'
+-# (which will cause the Makefiles to be regenerated when you run `make');
+-# (2) otherwise, pass the desired values on the `make' command line.
+-$(RECURSIVE_TARGETS):
++# into them and run 'make' without going through this Makefile.
++# To change the values of 'make' variables: instead of editing Makefiles,
++# (1) if the variable is set in 'config.status', edit 'config.status'
++# (which will cause the Makefiles to be regenerated when you run 'make');
++# (2) otherwise, pass the desired values on the 'make' command line.
++$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -1687,7 +1702,11 @@ $(RECURSIVE_TARGETS):
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+- list='$(SUBDIRS)'; for subdir in $$list; do \
++ case "$@" in \
++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++ *) list='$(SUBDIRS)' ;; \
++ esac; \
++ for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+@@ -1701,37 +1720,6 @@ $(RECURSIVE_TARGETS):
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+-
+-$(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
+- dot_seen=no; \
+- case "$@" in \
+- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+- *) list='$(SUBDIRS)' ;; \
+- esac; \
+- rev=''; for subdir in $$list; do \
+- if test "$$subdir" = "."; then :; else \
+- rev="$$subdir $$rev"; \
+- fi; \
+- done; \
+- rev="$$rev ."; \
+- target=`echo $@ | sed s/-recursive//`; \
+- for subdir in $$rev; do \
+- echo "Making $$target in $$subdir"; \
+- if test "$$subdir" = "."; then \
+- local_target="$$target-am"; \
+- else \
+- local_target="$$target"; \
+- fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
+- done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+@@ -1740,6 +1728,10 @@ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
++cscopelist-recursive:
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
++ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -1803,6 +1795,20 @@ GTAGS:
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
++cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP)'; \
++ case "$(srcdir)" in \
++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
++ *) sdir=$(subdir)/$(srcdir) ;; \
++ esac; \
++ for i in $$list; do \
++ if test -f "$$i"; then \
++ echo "$(subdir)/$$i"; \
++ else \
++ echo "$$sdir/$$i"; \
++ fi; \
++ done >> $(top_builddir)/cscope.files
++
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+@@ -1994,21 +2000,22 @@ uninstall-am: uninstall-aclPROGRAMS uninstall-binPROGRAMS \
+ uninstall-pyexecLTLIBRARIES uninstall-typelibsDATA
+
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+- ctags-recursive install install-am install-data-am \
+- install-strip tags-recursive
++ cscopelist-recursive ctags-recursive install install-am \
++ install-data-am install-strip tags-recursive
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-aclPROGRAMS \
+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+- clean-libtool clean-pyexecLTLIBRARIES ctags ctags-recursive \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-aclPROGRAMS install-am \
+- install-binPROGRAMS install-data install-data-am \
+- install-data-hook install-dist_libspice_client_glibincludeDATA \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-girDATA install-html install-html-am install-info \
+- install-info-am install-libLTLIBRARIES \
++ clean-libtool clean-pyexecLTLIBRARIES cscopelist \
++ cscopelist-recursive ctags ctags-recursive distclean \
++ distclean-compile distclean-generic distclean-libtool \
++ distclean-tags distdir dvi dvi-am html html-am info info-am \
++ install install-aclPROGRAMS install-am install-binPROGRAMS \
++ install-data install-data-am install-data-hook \
++ install-dist_libspice_client_glibincludeDATA install-dvi \
++ install-dvi-am install-exec install-exec-am install-girDATA \
++ install-html install-html-am install-info install-info-am \
++ install-libLTLIBRARIES \
+ install-libspice_client_glibincludeHEADERS \
+ install-libspice_client_gtkincludeHEADERS install-man \
+ install-nodist_libspice_client_glibincludeHEADERS \
+--
+1.8.0.2
+
diff --git a/mingw-spice-gtk.spec b/mingw-spice-gtk.spec
index bb20a97..c671aa5 100644
--- a/mingw-spice-gtk.spec
+++ b/mingw-spice-gtk.spec
@@ -1,14 +1,15 @@
%{?mingw_package_header}
Name: mingw-spice-gtk
-Version: 0.12
-Release: 3%{?dist}
+Version: 0.15
+Release: 1%{?dist}
Summary: A GTK+ widget for SPICE clients
License: LGPLv2+
URL: http://spice-space.org/page/Spice-Gtk
Source0: http://www.spice-space.org/download/gtk/spice-gtk-%{version}%{?_version_suffix}.tar.bz2
-Patch1: 0001-Fix-parsing-URI-query.patch
+#Upstream patch
+Patch0: 0001-mingw-Fix-link-errors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -122,7 +123,7 @@ Gtk+ client static libraries for SPICE desktop servers.
%prep
%setup -q -n spice-gtk-%{version}%{?_version_suffix} -c
pushd spice-gtk-%{version}%{?_version_suffix}
-%patch1 -p1
+%patch0 -p1
popd
if [ -n '%{?_version_suffix}' ]; then
@@ -193,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT
%doc spice-gtk-%{version}/COPYING
%doc spice-gtk-%{version}/README
%doc spice-gtk-%{version}/NEWS
-%{mingw32_bindir}/libspice-client-glib-2.0-1.dll
+%{mingw32_bindir}/libspice-client-glib-2.0-8.dll
%{mingw32_bindir}/libspice-controller-0.dll
%{mingw32_bindir}/snappy.exe
%{mingw32_bindir}/spicy-stats.exe
@@ -207,14 +208,14 @@ rm -rf $RPM_BUILD_ROOT
%files -n mingw32-spice-gtk
%defattr(-,root,root)
-%{mingw32_bindir}/libspice-client-gtk-2.0-1.dll
+%{mingw32_bindir}/libspice-client-gtk-2.0-4.dll
%{mingw32_libdir}/libspice-client-gtk-2.0.dll.a
%{mingw32_libdir}/pkgconfig/spice-client-gtk-2.0.pc
%{mingw32_includedir}/spice-client-gtk-2.0
%files -n mingw32-spice-gtk3
%defattr(-,root,root)
-%{mingw32_bindir}/libspice-client-gtk-3.0-1.dll
+%{mingw32_bindir}/libspice-client-gtk-3.0-4.dll
%{mingw32_bindir}/spicy.exe
%{mingw32_libdir}/libspice-client-gtk-3.0.dll.a
%{mingw32_libdir}/pkgconfig/spice-client-gtk-3.0.pc
@@ -235,7 +236,7 @@ rm -rf $RPM_BUILD_ROOT
%doc spice-gtk-%{version}/COPYING
%doc spice-gtk-%{version}/README
%doc spice-gtk-%{version}/NEWS
-%{mingw64_bindir}/libspice-client-glib-2.0-1.dll
+%{mingw64_bindir}/libspice-client-glib-2.0-8.dll
%{mingw64_bindir}/libspice-controller-0.dll
%{mingw64_bindir}/snappy.exe
%{mingw64_bindir}/spicy-stats.exe
@@ -249,14 +250,14 @@ rm -rf $RPM_BUILD_ROOT
%files -n mingw64-spice-gtk
%defattr(-,root,root)
-%{mingw64_bindir}/libspice-client-gtk-2.0-1.dll
+%{mingw64_bindir}/libspice-client-gtk-2.0-4.dll
%{mingw64_libdir}/libspice-client-gtk-2.0.dll.a
%{mingw64_libdir}/pkgconfig/spice-client-gtk-2.0.pc
%{mingw64_includedir}/spice-client-gtk-2.0
%files -n mingw64-spice-gtk3
%defattr(-,root,root)
-%{mingw64_bindir}/libspice-client-gtk-3.0-1.dll
+%{mingw64_bindir}/libspice-client-gtk-3.0-4.dll
%{mingw64_bindir}/spicy.exe
%{mingw64_libdir}/libspice-client-gtk-3.0.dll.a
%{mingw64_libdir}/pkgconfig/spice-client-gtk-3.0.pc
@@ -270,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT
%{mingw64_libdir}/libspice-client-gtk-3.0.a
%changelog
+* Fri Dec 21 2012 Christophe Fergeau <cfergeau at redhat.com> - 0.15-2
+- Update to the 0.15 release
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 5040933..f8cbc13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fec0ba391447b5b4d9242455c55b2a3 spice-gtk-0.12.tar.bz2
+316ed949e4dfb046a99a9b0c3c9a6e77 spice-gtk-0.15.tar.bz2
More information about the scm-commits
mailing list