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
This commit is contained in:
Kirk Allan 2023-04-04 17:25:36 +00:00 committed by Git OBS Bridge
parent e0771d26ff
commit e1f9fca949
2 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 4 15:03:28 UTC 2023 - Kirk Allan <kallan@suse.com>
- 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 <kallan@suse.com> Tue Mar 28 23:16:47 UTC 2023 - Kirk Allan <kallan@suse.com>

View File

@ -70,13 +70,18 @@ BuildRequires: pam-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: procps-devel BuildRequires: procps-devel
BuildRequires: update-desktop-files 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: containerd-devel
BuildRequires: glibc >= 2.27
BuildRequires: grpc-devel BuildRequires: grpc-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libtirpc-devel
BuildRequires: protobuf-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: rpcgen
BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) >= 2.21.0 BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) >= 2.21.0
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sm)
@ -87,11 +92,9 @@ BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xtst)
%define arg_containerinfo --enable-containerinfo=yes
%else %else
BuildRequires: glibc >= 2.12 BuildRequires: glibc >= 2.12
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
%define arg_containerinfo --enable-containerinfo=no
%endif %endif
BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
@ -237,7 +240,7 @@ Requires: libvmtools0 = %{version}
Those are the development headers for libvmtools. They are needed Those are the development headers for libvmtools. They are needed
if you intend to create own plugins for vmtoolsd. 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 %package containerinfo
Summary: Container Info Plugin Summary: Container Info Plugin
Group: System Environment/Libraries Group: System Environment/Libraries
@ -448,7 +451,7 @@ systemctl try-restart vmtoolsd.service || :
%postun -n libvmtools0 -p /sbin/ldconfig %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 %post containerinfo
systemctl try-restart vmtoolsd.service || : systemctl try-restart vmtoolsd.service || :
@ -585,7 +588,7 @@ systemctl try-restart vmtoolsd.service || :
%{_includedir}/libDeployPkg %{_includedir}/libDeployPkg
%{_libdir}/pkgconfig/libDeployPkg.pc %{_libdir}/pkgconfig/libDeployPkg.pc
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150500
%files containerinfo %files containerinfo
%{_libdir}/%{name}/plugins/vmsvc/libcontainerInfo.so %{_libdir}/%{name}/plugins/vmsvc/libcontainerInfo.so
%endif %endif