up to 11.1.5

- disable tests which apparently were not migrated to libtirpc

diff --git a/gcc10.patch b/gcc10.patch
deleted file mode 100644 (file)
index b880050..0000000
--- a/gcc10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6578e6a740a027e8957b8af1442277feba022ef9 Mon Sep 17 00:00:00 2001
-From: John Wolfe <jwolfe@vmware.com>
-Date: Fri, 31 Jul 2020 13:36:35 -0700
-Subject: [PATCH] Remove duplicate global definitions.
-
-Remove duplicate and unused global definitions for
-GDK_SELECTION_TYPE_TIMESTAMP and GDK_SELECTION_TYPE_UTF8_STRING.
-
-This fix will address https://github.com/vmware/open-vm-tools/issues/451
----
- .../services/plugins/dndcp/copyPasteUIX11.cpp          | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
-index be8369e74..68212ab8b 100644
---- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
-+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2009-2019 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2009-2020 VMware, Inc. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as published
-@@ -97,14 +97,6 @@ extern "C" {
- GdkAtom GDK_SELECTION_CLIPBOARD;
- #endif
- 
--#ifndef GDK_SELECTION_TYPE_TIMESTAMP
--GdkAtom GDK_SELECTION_TYPE_TIMESTAMP;
--#endif
--
--#ifndef GDK_SELECTION_TYPE_UTF8_STRING
--GdkAtom GDK_SELECTION_TYPE_UTF8_STRING;
--#endif
--
- 
- /*
-  *-----------------------------------------------------------------------------

diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 393962b2ea0bb8b970f4593b9752548fc365b8cb..d25f96779bd78df4f713726f011e12ddeda9bd11 100644 (file)
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -11,13 +11,13 @@
 Summary:       VMWare guest utilities
 Summary(pl.UTF-8):     Narzędzia dla systemu-gościa dla VMware
 Name:          open-vm-tools
-Version:       11.1.0
+Version:       11.1.5
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Applications/System
 Source0:       https://github.com/vmware/open-vm-tools/archive/stable-%{version}.tar.gz
-# Source0-md5: 6b52659d0f179007ff0cfee616da3442
+# Source0-md5: 706bec982774c445b15155a49e8d28b9
 Source1:       %{name}-packaging
 Source2:       %{name}-modprobe.d
 Source3:       %{name}-init
@@ -26,7 +26,6 @@ Source5:      vmware-vmblock-fuse.service
 Source6:       vmtoolsd.pamd
 Patch0:                %{name}-dnd.patch
 Patch1:                iopl.patch
-Patch2:                gcc10.patch
 URL:           https://github.com/vmware/open-vm-tools
 BuildRequires: autoconf
 BuildRequires: doxygen
@@ -42,6 +41,7 @@ BuildRequires:        libmspack-devel
 BuildRequires: libnotify-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
+BuildRequires: libtirpc-devel
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
 BuildRequires: procps-devel >= 1:3.3.3-2
@@ -140,7 +140,6 @@ Reguły UDEV dla open-vm-tools.
 %setup -q -n %{name}-stable-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 cp %{SOURCE1} open-vm-tools/packaging
 
@@ -154,6 +153,7 @@ install -d config
 %{__autoconf}
 export CUSTOM_PROCPS_NAME=procps
 %configure2_13 \
+       --disable-tests \
        --without-kernel-modules \
 %if %{with x}
        --with-x