[packages/spice-space/DEVEL] - updated to 0.13.0 (unstable series) - updated link,codegen patches
qboosh
qboosh at pld-linux.org
Sun Apr 3 17:36:22 CEST 2016
commit 1aee871f80f6544cfb5ee0949977643dc4a21b13
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 3 17:36:20 2016 +0200
- updated to 0.13.0 (unstable series)
- updated link,codegen patches
spice-codegen.patch | 15 +++++++++++++++
spice-link.patch | 9 ++++++---
spice-space.spec | 12 ++++++++----
3 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/spice-space.spec b/spice-space.spec
index 736ed7a..e69619d 100644
--- a/spice-space.spec
+++ b/spice-space.spec
@@ -1,17 +1,18 @@
#
# Conditional build:
-%bcond_without opengl # OpenGL support
+%bcond_without opengl # OpenGL support
+%bcond_without static_libs # static library
#
Summary: SPICE virtualization solution
Summary(pl.UTF-8): System wirtualizacji SPICE
# real package name (spice) is already occupied
Name: spice-space
-Version: 0.12.6
+Version: 0.13.0
Release: 1
License: LGPL v2.1+
Group: Applications/Emulators
Source0: http://www.spice-space.org/download/releases/spice-%{version}.tar.bz2
-# Source0-md5: 605a8c8ea80bc95076c4b3539c6dd026
+# Source0-md5: 941d322ff4967fb160dd0ca53306139d
Patch0: spice-link.patch
Patch1: spice-am.patch
Patch2: spice-codegen.patch
@@ -152,7 +153,8 @@ cd ..
--enable-client \
--enable-lz4 \
%{?with_opengl:--enable-opengl} \
- --enable-smartcard
+ --enable-smartcard \
+ %{?with_static_libs:--enable-static}
%{__make}
@@ -183,6 +185,8 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/spice-server
%{_pkgconfigdir}/spice-server.pc
+%if %{with static_libs}
%files -n spice-server-static
%defattr(644,root,root,755)
%{_libdir}/libspice-server.a
+%endif
diff --git a/spice-codegen.patch b/spice-codegen.patch
index 37d8513..5f6f241 100644
--- a/spice-codegen.patch
+++ b/spice-codegen.patch
@@ -13,3 +13,18 @@
$(CODE_GENERATOR_BASEDIR)/spice_codegen.py \
$(NULL)
+--- spice-0.13.0/spice-common/tests/Makefile.am.orig 2016-01-13 13:27:47.000000000 +0100
++++ spice-0.13.0/spice-common/tests/Makefile.am 2016-04-03 08:33:52.601261670 +0200
+@@ -27,12 +27,6 @@
+ BUILT_SOURCES = $(TEST_MARSHALLERS)
+
+ MARSHALLERS_DEPS = \
+- $(CODE_GENERATOR_BASEDIR)/python_modules/__init__.py \
+- $(CODE_GENERATOR_BASEDIR)/python_modules/codegen.py \
+- $(CODE_GENERATOR_BASEDIR)/python_modules/demarshal.py \
+- $(CODE_GENERATOR_BASEDIR)/python_modules/marshal.py \
+- $(CODE_GENERATOR_BASEDIR)/python_modules/ptypes.py \
+- $(CODE_GENERATOR_BASEDIR)/python_modules/spice_parser.py \
+ $(CODE_GENERATOR_BASEDIR)/spice_codegen.py \
+ $(NULL)
+
diff --git a/spice-link.patch b/spice-link.patch
index 4976965..67cc11f 100644
--- a/spice-link.patch
+++ b/spice-link.patch
@@ -1,10 +1,13 @@
---- spice-0.12.6/spice-common/m4/spice-deps.m4.orig 2015-08-14 10:54:53.000000000 +0200
-+++ spice-0.12.6/spice-common/m4/spice-deps.m4 2015-10-09 19:14:14.964766691 +0200
-@@ -125,6 +125,7 @@
+--- spice-0.13.0/spice-common/m4/spice-deps.m4.orig 2016-01-13 13:27:47.000000000 +0100
++++ spice-0.13.0/spice-common/m4/spice-deps.m4 2016-04-03 10:52:22.234246284 +0200
+@@ -147,8 +147,10 @@
if test "x$enable_opengl" = "xyes"; then
AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
AC_CHECK_LIB(GLU, gluSphere, GL_LIBS="$GL_LIBS -lGLU", enable_opengl=no)
+ AC_CHECK_LIB(X11, XOpenDisplay, GL_LIBS="$GL_LIBS -lX11", have_opengl=no)
AC_DEFINE([USE_OPENGL], [1], [Define to build with OpenGL support])
AC_DEFINE([GL_GLEXT_PROTOTYPES], [], [Enable GLExt prototypes])
++ AC_SUBST([GL_LIBS])
+ if test "x$enable_opengl" = "xno"; then
+ AC_MSG_ERROR([GL libraries not available])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spice-space.git/commitdiff/1aee871f80f6544cfb5ee0949977643dc4a21b13
More information about the pld-cvs-commit
mailing list