RHEL 7 now includes libdnet, so re-enable it.

This commit is contained in:
Richard W.M. Jones 2013-06-04 12:19:25 +01:00
parent 7ae75828a3
commit f7b1b78b3e

View File

@ -6,7 +6,7 @@
Name: open-vm-tools
Version: %{toolsversion}
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Open VMware Tools for virtual machines hosted on VMware
Group: Applications/System
License: GPLv2
@ -22,9 +22,7 @@ BuildRequires: fuse-devel
BuildRequires: glib2-devel >= 2.14.0
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: gtkmm24-devel
%if !0%{?rhel}
BuildRequires: libdnet-devel
%endif
BuildRequires: libicu-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
@ -77,9 +75,7 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs"
export CXXLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs"
%configure \
--without-kernel-modules \
%if 0%{?rhel}
--without-dnet \
%endif
--disable-static
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}
@ -160,6 +156,9 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
%{_libdir}/libvmtools.so
%changelog
* Tue Jun 4 2013 Richard W.M. Jones <rjones@redhat.com> - 9.2.3-7
- RHEL 7 now includes libdnet, so re-enable it.
* Fri May 24 2013 Richard W.M. Jones <rjones@redhat.com> - 9.2.3-6
- +BR gcc-c++. If this is missing it fails to build.
- On RHEL, disable libdnet.