Accepting request 391293 from Virtualization:VMware

1 OBS-URL: https://build.opensuse.org/request/show/391293 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-vm-tools?expand=0&rev=65
2016-04-28 14:55:58 +00:00 · 2016-04-28 14:55:58 +00:00 · 56001451fb
commit 56001451fb
parent cc464974fb 298701dbc2
6 changed files with 1188 additions and 10 deletions
--- a/open-vm-tools-10.0.0-3000743.tar.gz
+++ b/open-vm-tools-10.0.0-3000743.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8765784d85e4a39b08f1cbc2fb9bbb920027d5fa0abb9b99cec4a886a793ad94
-size 4165108
--- a/open-vm-tools-buildsystem-fixup.patch
+++ b/open-vm-tools-buildsystem-fixup.patch
@ -0,0 +1,77 @@
+Index: open-vm-tools/services/plugins/dndcp/Makefile.am
+===================================================================
+--- open-vm-tools.orig/services/plugins/dndcp/Makefile.am
+++ open-vm-tools/services/plugins/dndcp/Makefile.am
+@@ -16,7 +16,7 @@
+ ################################################################################
+ 
+ plugindir = @VMUSR_PLUGIN_INSTALLDIR@
+-plugin_LTLIBRARIES = libdndcp.la
+plugin_LTLIBRARIES = libdndcpdnd.la libdndcpcp.la libdndcpbld.la libdndcp.la
+ 
+ libdndcp_la_CPPFLAGS =
+ libdndcp_la_CPPFLAGS += @GTK_CPPFLAGS@
+@@ -31,21 +31,25 @@ libdndcp_la_CPPFLAGS += -I$(top_builddir
+ libdndcp_la_LDFLAGS =
+ libdndcp_la_LDFLAGS += @PLUGIN_LDFLAGS@
+ 
+-libdndcp_la_LIBADD =
+libdndcp_la_LIBADD =  libdndcpdnd.la libdndcpcp.la libdndcpbld.la
+ libdndcp_la_LIBADD += @COMMON_XLIBS@
+ libdndcp_la_LIBADD += @GTK_LIBS@
+ libdndcp_la_LIBADD += @GTKMM_LIBS@
+ libdndcp_la_LIBADD += @VMTOOLS_LIBS@
+ libdndcp_la_LIBADD += @HGFS_LIBS@
+ 
+-libdndcp_la_SOURCES =
+-
+-libdndcp_la_SOURCES += dnd/dndClipboard.c
+-libdndcp_la_SOURCES += dnd/dndCommon.c
+-libdndcp_la_SOURCES += dnd/dndCPMsgV4.c
+-libdndcp_la_SOURCES += dnd/dndLinux.c
+-libdndcp_la_SOURCES += dnd/dndMsg.c
+libdndcpcp_la_CPPFLAGS =
+libdndcpcp_la_CPPFLAGS += @GTK_CPPFLAGS@
+libdndcpcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd
+
+libdndcpdnd_la_SOURCES =
+libdndcpdnd_la_SOURCES += dnd/dndClipboard.c
+libdndcpdnd_la_SOURCES += dnd/dndCommon.c
+libdndcpdnd_la_SOURCES += dnd/dndCPMsgV4.c
+libdndcpdnd_la_SOURCES += dnd/dndLinux.c
+libdndcpdnd_la_SOURCES += dnd/dndMsg.c
+ 
+libdndcp_la_SOURCES =
+ libdndcp_la_SOURCES += dndGuest/copyPasteRpcV3.cc
+ libdndcp_la_SOURCES += dndGuest/dndFileList.cc
+ libdndcp_la_SOURCES += dndGuest/dndRpcV3.cc
+@@ -67,8 +71,6 @@ libdndcp_la_SOURCES += dndGuest/dndCPTra
+ libdndcp_la_SOURCES += stringxx/string.cc
+ libdndcp_la_SOURCES += xutils/xutils.cc
+ 
+-libdndcp_la_SOURCES += copyPasteCompat.c
+-libdndcp_la_SOURCES += copyPasteCompatX11.c
+ libdndcp_la_SOURCES += copyPasteDnDWrapper.cpp
+ libdndcp_la_SOURCES += copyPasteDnDX11.cpp
+ libdndcp_la_SOURCES += copyPasteUIX11.cpp
+@@ -77,6 +79,10 @@ libdndcp_la_SOURCES += dndcp.cpp
+ libdndcp_la_SOURCES += dragDetWndX11.cpp
+ libdndcp_la_SOURCES += pointer.cpp
+ 
+libdndcpcp_la_SOURCES =
+libdndcpcp_la_SOURCES += copyPasteCompat.c
+libdndcpcp_la_SOURCES += copyPasteCompatX11.c
+
+ BUILT_SOURCES =
+ BUILT_SOURCES += cpFileContents.h
+ BUILT_SOURCES += cpFileContents_xdr.c
+@@ -84,7 +90,8 @@ BUILT_SOURCES += cpFileContents_xdr.c
+ CLEANFILES =
+ CLEANFILES += $(BUILT_SOURCES)
+ 
+-libdndcp_la_SOURCES += cpFileContents_xdr.c
+libdndcpbld_la_SOURCES =
+libdndcpbld_la_SOURCES += cpFileContents_xdr.c
+ 
+ cpFileContents.h: cpFileContents.x
+ 	@RPCGEN_WRAPPER@ services/plugins/dndcp/cpFileContents.x $@
--- a/open-vm-tools-posixly.patch
+++ b/open-vm-tools-posixly.patch
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Fri Apr 22 12:12:09 UTC 2016 - jslaby@suse.com
+
+- they renamed open-vm-tools-stable-10.0.5.tar.gz to
+  stable-10.0.5.tar.gz -- fix .spec accordingly
+
+-------------------------------------------------------------------
+Wed Apr 20 08:57:17 UTC 2016 - dimstar@opensuse.org
+
+- Add open-vm-tools-posixly.patch: defined(linux) is not posix
+  compliant and modern compilers no longer accept it. Change to
+  defined(__linux__)
+  https://github.com/vmware/open-vm-tools/pull/81
+- Add open-vm-tools-buildsystem-fixup.patch: since libsigc++ injects
+  -std=c++11 into CFLAGS, the various objects in open-vm-tools need
+  to be split up a bit in order to not have a mixed C/C++ object
+  receiving the same CFLAGS.
+
+-------------------------------------------------------------------
+Wed Dec 23 23:43:22 UTC 2015 - mlatimer@suse.com
+
+- Compile without gtkmm support for SLES12 based environments
+  (which do not provide gtkmm2.4)
+
+-------------------------------------------------------------------
+Tue Dec  1 01:10:01 UTC 2015 - mlatimer@suse.com
+
+- Update to 10.0.5 stable branch
+  + [vgauth] fix timestamp check
+  + [libresolutionSet.so] Add an error handler to X11 resolutionSet
+  + [vmci.ko] Kill tasklet when unloading vmci module
+  + [libvmbackup.so] Quiesced snapshots Skip freezing autofs mounts.
+  + [vmhgfs.ko] make vmhgfs compatible with Linux kernel 4.2 
+
 -------------------------------------------------------------------
 Fri Oct 30 15:55:45 UTC 2015 - mlatimer@suse.com

--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@ -1,7 +1,7 @@
 #
 # spec file for package open-vm-tools
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
 #
 # All modifications and additions to the file contributed by third parties
@ -68,15 +68,15 @@
 %define with_X 1

 Name:           open-vm-tools
-%define tarname open-vm-tools
-Version:        10.0.0
+%define subname open-vm-tools
+%define tarname stable
+Version:        10.0.5
 Release:        0
-%define         svn_rev 3000743
 Summary:        Open Virtual Machine Tools
 License:        BSD-3-Clause and GPL-2.0 and LGPL-2.1
 Group:          System/Emulators/PC
 Url:            https://github.com/vmware/open-vm-tools
-Source:         https://github.com/vmware/open-vm-tools/archive/%{tarname}-%{version}-%{svn_rev}.tar.gz
+Source:         https://github.com/vmware/open-vm-tools/archive/%{tarname}-%{version}.tar.gz
 Source1:        vmtoolsd
 Source2:        vmtoolsd.service
 Source3:        vmware-user-autostart.desktop
@ -137,6 +137,8 @@ Requires(pre):  %fillup_prereq
 Requires(pre):  %insserv_prereq
 ExclusiveArch:  %ix86 x86_64
 Patch0:         enable-gcc46+.patch
+Patch1:         open-vm-tools-posixly.patch
+Patch2:         open-vm-tools-buildsystem-fixup.patch

 %if %{KMP}
 %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
@ -233,11 +235,12 @@ Those are the development headers for libvmtools. They are needed
 if you intend to create own plugins for vmtoolsd.

 %prep
-# The tarball seems a little bit broken...
-%setup -q -n %{tarname}-%{tarname}-%{version}-%{svn_rev}/%{tarname}
+%setup -q -n %{name}-%{tarname}-%{version}/%{subname}
 # fix for an rpmlint warning regarding wrong line feeds
 sed -i -e "s/\r//" README
 %patch0 -p1
+%patch1 -p2
+%patch2 -p1

 %build
 %if ! %{KMP}
@ -277,6 +280,9 @@ chmod 755 configure
    --without-x \
 %endif
    --disable-dependency-tracking \
+%if ! 0%{?is_opensuse} && 0%{?suse_version} == 1315
+    --without-gtkmm \
+%endif
 %if ! %{with vgauth}
    --without-xmlsecurity \
    --without-xerces \
--- a/stable-10.0.5.tar.gz
+++ b/stable-10.0.5.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:405eae50c9edacabc01ba4bc73b3bae2882c47518c4bae1bd1b631d341772706
+size 3580818