| |
@@ -28,7 +28,7 @@
|
| |
|
| |
Name: open-vm-tools
|
| |
Version: %{toolsversion}
|
| |
- Release: 3%{?dist}
|
| |
+ Release: 4%{?dist}
|
| |
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
|
| |
License: GPLv2
|
| |
URL: https://github.com/vmware/%{name}
|
| |
@@ -47,10 +47,10 @@
|
| |
|
| |
Patch1: %{name}-gcc11.patch
|
| |
|
| |
- BuildRequires: make
|
| |
BuildRequires: autoconf
|
| |
BuildRequires: automake
|
| |
BuildRequires: libtool
|
| |
+ BuildRequires: make
|
| |
BuildRequires: gcc-c++
|
| |
BuildRequires: doxygen
|
| |
# Fuse is optional and enables vmblock-fuse
|
| |
@@ -69,6 +69,7 @@
|
| |
BuildRequires: gtk2-devel >= 2.4.0
|
| |
BuildRequires: gtkmm24-devel
|
| |
%endif
|
| |
+ BuildRequires: libdrm-devel
|
| |
BuildRequires: libicu-devel
|
| |
BuildRequires: libmspack-devel
|
| |
# Unfortunately, xmlsec1-openssl does not add libtool-ltdl
|
| |
@@ -84,24 +85,25 @@
|
| |
BuildRequires: openssl-devel
|
| |
BuildRequires: pam-devel
|
| |
BuildRequires: procps-devel
|
| |
- %if 0%{?fedora} >= 28 || 0%{?rhel} >=9
|
| |
+ %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
|
| |
BuildRequires: rpcgen
|
| |
%endif
|
| |
- BuildRequires: systemd
|
| |
- %if 0%{?fedora} >= 28 || 0%{?rhel} >=9
|
| |
+ BuildRequires: systemd-devel
|
| |
+ %if 0%{?fedora} >= 30 || 0%{?rhel} >= 9
|
| |
+ BuildRequires: systemd-rpm-macros
|
| |
+ %endif
|
| |
+ %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
|
| |
BuildRequires: libtirpc-devel
|
| |
%endif
|
| |
BuildRequires: xmlsec1-openssl-devel
|
| |
|
| |
Requires: coreutils
|
| |
Requires: fuse
|
| |
- Requires: libdrm
|
| |
Requires: iproute
|
| |
Requires: grep
|
| |
Requires: pciutils
|
| |
Requires: sed
|
| |
Requires: systemd
|
| |
- Requires: systemd-libs
|
| |
Requires: tar
|
| |
Requires: util-linux
|
| |
Requires: which
|
| |
@@ -174,7 +176,7 @@
|
| |
# configure.ac get modified
|
| |
autoreconf -vif
|
| |
|
| |
- %if 0%{?fedora} >= 28 || 0%{?rhel} >=9
|
| |
+ %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
|
| |
%global usetirpc with-tirpc
|
| |
%else
|
| |
%global usetirpc without-tirpc
|
| |
@@ -258,8 +260,7 @@
|
| |
# Cleanup vmtoolsd-init.service in case of upgrades
|
| |
%{_bindir}/systemctl disable %{toolsdaemon}-init.service &> /dev/null || /bin/true
|
| |
fi
|
| |
- %systemd_post %{vgauthdaemon}.service
|
| |
- %systemd_post %{toolsdaemon}.service
|
| |
+ %systemd_post %{vgauthdaemon}.service %{toolsdaemon}.service
|
| |
|
| |
%post desktop
|
| |
%systemd_post run-vmblock\x2dfuse.mount
|
| |
@@ -271,8 +272,7 @@
|
| |
fi
|
| |
|
| |
%preun
|
| |
- %systemd_preun %{toolsdaemon}.service
|
| |
- %systemd_preun %{vgauthdaemon}.service
|
| |
+ %systemd_preun %{toolsdaemon}.service %{vgauthdaemon}.service
|
| |
|
| |
if [ "$1" = "0" -a \
|
| |
-f %{_bindir}/vmware-checkvm ] && \
|
| |
@@ -301,8 +301,7 @@
|
| |
%else
|
| |
/sbin/ldconfig
|
| |
%endif
|
| |
- %systemd_postun_with_restart %{toolsdaemon}.service
|
| |
- %systemd_postun_with_restart %{vgauthdaemon}.service
|
| |
+ %systemd_postun_with_restart %{toolsdaemon}.service %{vgauthdaemon}.service
|
| |
|
| |
%postun desktop
|
| |
%systemd_postun run-vmblock\x2dfuse.mount
|
| |
@@ -391,6 +390,11 @@
|
| |
%{_bindir}/vmware-vgauth-smoketest
|
| |
|
| |
%changelog
|
| |
+ * Tue Mar 16 2021 Neal Gompa <ngompa13@gmail.com> - 11.2.5-4
|
| |
+ - Add missing BRs
|
| |
+ - Clean up conditionals to build correctly with EL8+
|
| |
+ - Simplify systemd scriptlets
|
| |
+
|
| |
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 11.2.5-3
|
| |
- Rebuilt for updated systemd-rpm-macros
|
| |
See https://pagure.io/fesco/issue/2583.
|
| |
ngompa
commented 3 years ago