[packages/spice-space/DEVEL] - up to 0.13.2 - removed obsolete link,codegen patches

qboosh qboosh at pld-linux.org
Tue Sep 27 21:38:47 CEST 2016


commit 98ccf59addb57c21651d6b30561703e68a3fff6e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 27 21:40:36 2016 +0200

    - up to 0.13.2
    - removed obsolete link,codegen patches

 spice-codegen.patch | 30 ------------------------------
 spice-link.patch    | 13 -------------
 spice-space.spec    | 27 ++++++---------------------
 3 files changed, 6 insertions(+), 64 deletions(-)
---
diff --git a/spice-space.spec b/spice-space.spec
index e69619d..cb878c5 100644
--- a/spice-space.spec
+++ b/spice-space.spec
@@ -1,24 +1,19 @@
 #
 # Conditional build:
-%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.13.0
+Version:	0.13.2
 Release:	1
 License:	LGPL v2.1+
 Group:		Applications/Emulators
-Source0:	http://www.spice-space.org/download/releases/spice-%{version}.tar.bz2
-# Source0-md5:	941d322ff4967fb160dd0ca53306139d
-Patch0:		spice-link.patch
-Patch1:		spice-am.patch
-Patch2:		spice-codegen.patch
-URL:		http://www.spice-space.org/
-%{?with_opengl:BuildRequires:	OpenGL-devel}
-%{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
+Source0:	https://www.spice-space.org/download/releases/spice-%{version}.tar.bz2
+# Source0-md5:	e007fbe06359db1376208b026fa5b58d
+Patch0:		spice-am.patch
+URL:		https://www.spice-space.org/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.63
@@ -40,14 +35,7 @@ BuildRequires:	python >= 2
 BuildRequires:	python-pyparsing
 BuildRequires:	python-six
 BuildRequires:	rpmbuild(macros) >= 1.527
-BuildRequires:	spice-protocol >= 0.12.10
-BuildRequires:	spice-protocol-codegen >= 0.12.10
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXfixes-devel
-BuildRequires:	xorg-lib-libXinerama-devel >= 1.0
-BuildRequires:	xorg-lib-libXrandr-devel >= 1.2
-BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	spice-protocol >= 0.12.12
 BuildRequires:	zlib-devel
 ExclusiveArch:	%{ix86} %{x8664} x32 arm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -132,8 +120,6 @@ Klient SPICE dla X11.
 %prep
 %setup -q -n spice-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -152,7 +138,6 @@ cd ..
 	--disable-silent-rules \
 	--enable-client \
 	--enable-lz4 \
-	%{?with_opengl:--enable-opengl} \
 	--enable-smartcard \
 	%{?with_static_libs:--enable-static}
 
diff --git a/spice-codegen.patch b/spice-codegen.patch
deleted file mode 100644
index 5f6f241..0000000
--- a/spice-codegen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- spice-0.12.6/spice-common/common/Makefile.am.orig	2015-08-14 10:54:53.000000000 +0200
-+++ spice-0.12.6/spice-common/common/Makefile.am	2015-10-09 19:27:13.894734003 +0200
-@@ -100,12 +100,6 @@
- 	$(NULL)
- 
- 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)
- 
---- 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
deleted file mode 100644
index 67cc11f..0000000
--- a/spice-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/98ccf59addb57c21651d6b30561703e68a3fff6e



More information about the pld-cvs-commit mailing list