From f03a1b1fc8ade749b5eb23c60e3690a3652d40a6 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 9 Apr 2021 12:45:40 +0200 Subject: [PATCH] Fix to open-vm-tools-11.2.5-2 build Resolves: bz#1936382 --- open-vm-tools-gcc11.patch | 6 +++--- open-vm-tools.spec | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/open-vm-tools-gcc11.patch b/open-vm-tools-gcc11.patch index ae85124..bee1795 100644 --- a/open-vm-tools-gcc11.patch +++ b/open-vm-tools-gcc11.patch @@ -1,7 +1,7 @@ -diff --git a/lib/pollGtk/pollGtk.c b/lib/pollGtk/pollGtk.c +diff --git a/open-vm-tools/lib/pollGtk/pollGtk.c b/open-vm-tools/lib/pollGtk/pollGtk.c index 4ccaeda..336a8bf 100644 ---- a/lib/pollGtk/pollGtk.c -+++ b/lib/pollGtk/pollGtk.c +--- a/open-vm-tools/lib/pollGtk/pollGtk.c ++++ b/open-vm-tools/lib/pollGtk/pollGtk.c @@ -127,7 +127,7 @@ typedef struct Poll { } Poll; diff --git a/open-vm-tools.spec b/open-vm-tools.spec index b4a09af..3ad24e1 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -48,8 +48,6 @@ ExclusiveArch: %{ix86} x86_64 Patch1: %{name}-gcc11.patch # For bz#1936382 - [ESXi][RHEL-9][FTBS] open-vm-tools not working with newer gtk libraries Patch2: ovt-Fixes-necessary-to-build-open-vm-tools-with-newer-gt.patch -# For bz#1936382 - [ESXi][RHEL-9][FTBS] open-vm-tools not working with newer gtk libraries -Patch3: ovt-Update-spec-file-for-correct-build.patch BuildRequires: autoconf BuildRequires: automake @@ -174,7 +172,7 @@ useful for verifying the functioning of %{name} in VMware virtual machines. %prep -%autosetup -p1 -n %{name}-%{version}-%{toolsbuild} +%autosetup -p2 -n %{name}-%{version}-%{toolsbuild} %build # Required for regenerating configure script when