From e1f9fca94961eb24d2c9c9632a73ed90a8a82e4beaa4a6d41174ccac036b6044 Mon Sep 17 00:00:00 2001 From: Kirk Allan Date: Tue, 4 Apr 2023 17:25:36 +0000 Subject: [PATCH] Accepting request 1077252 from home:kallan:branches:Virtualization:VMware - As per jsc-PED-1344, update spec file to only build the containerinfo plugin for TW/SLES 15 SP5 and newer. OBS-URL: https://build.opensuse.org/request/show/1077252 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=430 --- open-vm-tools.changes | 6 ++++++ open-vm-tools.spec | 19 +++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/open-vm-tools.changes b/open-vm-tools.changes index 00cb301..4478e64 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 4 15:03:28 UTC 2023 - Kirk Allan + +- As per jsc-PED-1344, update spec file to only build the containerinfo + plugin for TW/SLES 15 SP5 and newer. + ------------------------------------------------------------------- Tue Mar 28 23:16:47 UTC 2023 - Kirk Allan diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 3d214cf..6f780fe 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -70,13 +70,18 @@ BuildRequires: pam-devel BuildRequires: pcre-devel BuildRequires: procps-devel BuildRequires: update-desktop-files -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150500 BuildRequires: containerd-devel -BuildRequires: glibc >= 2.27 BuildRequires: grpc-devel BuildRequires: libcurl-devel -BuildRequires: libtirpc-devel BuildRequires: protobuf-devel +%define arg_containerinfo --enable-containerinfo=yes +%else +%define arg_containerinfo --enable-containerinfo=no +%endif +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +BuildRequires: glibc >= 2.27 +BuildRequires: libtirpc-devel BuildRequires: rpcgen BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) >= 2.21.0 BuildRequires: pkgconfig(sm) @@ -87,11 +92,9 @@ BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xtst) -%define arg_containerinfo --enable-containerinfo=yes %else BuildRequires: glibc >= 2.12 BuildRequires: xorg-x11-devel -%define arg_containerinfo --enable-containerinfo=no %endif BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libudev) @@ -237,7 +240,7 @@ Requires: libvmtools0 = %{version} Those are the development headers for libvmtools. They are needed if you intend to create own plugins for vmtoolsd. -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150500 %package containerinfo Summary: Container Info Plugin Group: System Environment/Libraries @@ -448,7 +451,7 @@ systemctl try-restart vmtoolsd.service || : %postun -n libvmtools0 -p /sbin/ldconfig -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150500 %post containerinfo systemctl try-restart vmtoolsd.service || : @@ -585,7 +588,7 @@ systemctl try-restart vmtoolsd.service || : %{_includedir}/libDeployPkg %{_libdir}/pkgconfig/libDeployPkg.pc -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150500 %files containerinfo %{_libdir}/%{name}/plugins/vmsvc/libcontainerInfo.so %endif