diff --git a/.gitignore b/.gitignore index 544020d..955b15e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /open-vm-tools-11.2.5-17337674.tar.gz /open-vm-tools-11.3.0-18090558.tar.gz /open-vm-tools-11.3.5-18557794.tar.gz +/open-vm-tools-12.0.0-19345655.tar.gz diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 53775f9..73b4fed 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -19,9 +19,9 @@ ################################################################################ %global _hardened_build 1 -%global majorversion 11.3 -%global minorversion 5 -%global toolsbuild 18557794 +%global majorversion 12.0 +%global minorversion 0 +%global toolsbuild 19345655 %global toolsversion %{majorversion}.%{minorversion} %global toolsdaemon vmtoolsd %global vgauthdaemon vgauthd @@ -46,7 +46,7 @@ Source5: vmtoolsd.pam %if 0%{?rhel} >= 7 -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 aarch64 %else ExclusiveArch: %{ix86} x86_64 aarch64 %endif @@ -62,7 +62,12 @@ BuildRequires: make BuildRequires: gcc-c++ BuildRequires: doxygen # Fuse is optional and enables vmblock-fuse +# Switching Fedora to use fuse3. Red Hat to switch on their own schedule. +%if 0%{?fedora} +BuildRequires: fuse3-devel +%else BuildRequires: fuse-devel +%endif BuildRequires: glib2-devel >= 2.14.0 BuildRequires: libicu-devel BuildRequires: libmspack-devel @@ -97,7 +102,11 @@ BuildRequires: systemd %endif Requires: coreutils +%if 0%{?fedora} +Requires: fuse3 +%else Requires: fuse +%endif Requires: iproute Requires: grep Requires: pciutils @@ -145,6 +154,15 @@ This package contains only the user-space programs and utility scripts of %{name} that are essential for performing service discovery in VMware virtual machines by vRealize Operations Service Discovery Management Pack. +%package salt-minion +Summary: Script file to install/uninstall salt-minion +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release}, systemd, curl, coreutils, gawk, grep +ExclusiveArch: x86_64 + +%description salt-minion +This package contains a script to setup Salt Minion on VMware virtual machines. + %package devel Summary: Development libraries for Open Virtual Machine Tools Requires: %{name}%{?_isa} = %{version}-%{release} @@ -174,6 +192,9 @@ autoreconf -vif --enable-xmlsec1 \ --enable-resolutionkms \ --enable-servicediscovery \ +%ifarch x86_64 + --enable-salt-minion \ +%endif %if 0%{?fedora} || 0%{?rhel} >= 8 --with-tirpc \ --without-gtk2 \ @@ -348,6 +369,7 @@ fi %{_libdir}/%{name}/plugins/common/*.so %dir %{_libdir}/%{name}/plugins/vmsvc %{_libdir}/%{name}/plugins/vmsvc/libappInfo.so +%{_libdir}/%{name}/plugins/vmsvc/libcomponentMgr.so %{_libdir}/%{name}/plugins/vmsvc/libdeployPkgPlugin.so %{_libdir}/%{name}/plugins/vmsvc/libgdp.so %{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so @@ -376,6 +398,13 @@ fi %{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so %{_libdir}/%{name}/serviceDiscovery +%ifarch x86_64 +%files salt-minion +%dir %{_libdir}/%{name}/componentMgr/ +%dir %{_libdir}/%{name}/componentMgr/saltMinion/ +%{_libdir}/%{name}/componentMgr/saltMinion/svtminion.sh +%endif + %files devel %doc docs/api/build/* %exclude %{_includedir}/libDeployPkg/ @@ -392,6 +421,12 @@ fi %{_bindir}/vmware-vgauth-smoketest %changelog +* Mon May 9 2022 John Wolfe - 12.0.0-1 +- Package new upstream version open-vm-tools-12.0.0-19345655. +- Enable build of the new salt-minion plugin package. +- Deferring enablement of new containerInfo plugin until a later revision. +- Build with fuse3 on Fedora. + * Thu Feb 24 2022 John Wolfe - 11.3.5-1 - Package new upstream version open-vm-tools-11.3.5-18557794. diff --git a/sources b/sources index 6a060df..88d4e80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (open-vm-tools-11.3.5-18557794.tar.gz) = fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e +SHA512 (open-vm-tools-12.0.0-19345655.tar.gz) = 5c41ed81eb0e2755ca4a4adf8691f60daf016577d4b98ede36916fb95412f5dfdc086a3a42ef87fcb669ce7026ea1383a2dccc49fe30d192b187b8592a25e935