diff --git a/.open-vm-tools.metadata b/.open-vm-tools.metadata
index d2eac3f..c20e812 100644
--- a/.open-vm-tools.metadata
+++ b/.open-vm-tools.metadata
@@ -1 +1 @@
-68d71ccb22995a111dac66372b6cde36b4c23ad9 SOURCES/open-vm-tools-9.2.3-1031360.tar.gz
+92c80a00b4879e108b6970f7d016479e49421bd8 SOURCES/open-vm-tools-9.4.0-1280544.tar.gz
diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec
index d420993..f9be38c 100644
--- a/SPECS/open-vm-tools.spec
+++ b/SPECS/open-vm-tools.spec
@@ -1,19 +1,44 @@
-%global majorversion 9.2
-%global minorversion 3
-%global toolsbuild 1031360
+################################################################################
+### Copyright 2013 VMware, Inc. All rights reserved.
+###
+### RPM SPEC file for building open-vm-tools packages.
+###
+###
+### This program is free software; you can redistribute it and/or modify
+### it under the terms of version 2 of the GNU General Public License as
+### published by the Free Software Foundation.
+###
+### This program is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+### GNU General Public License for more details.
+###
+### You should have received a copy of the GNU General Public License
+### along with this program; if not, write to the Free Software
+### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+################################################################################
+
+%global _hardened_build 1
+%global majorversion 9.4
+%global minorversion 0
+%global toolsbuild 1280544
%global toolsversion %{majorversion}.%{minorversion}
%global toolsdaemon vmtoolsd
Name: open-vm-tools
Version: %{toolsversion}
-Release: 8%{?dist}
-Summary: Open VMware Tools for virtual machines hosted on VMware
+Release: 3%{?dist}
+Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
Group: Applications/System
License: GPLv2
URL: http://%{name}.sourceforge.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/stable-%{majorversion}.x/%{name}-%{version}-%{toolsbuild}.tar.gz
Source1: %{toolsdaemon}.service
+%if 0%{?rhel} >= 7
+ExclusiveArch: x86_64
+%else
ExclusiveArch: %{ix86} x86_64
+%endif
BuildRequires: gcc-c++
BuildRequires: doxygen
@@ -33,7 +58,7 @@ BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: pam-devel
BuildRequires: procps-devel
-BuildRequires: systemd-units
+BuildRequires: systemd
Requires(post): systemd
Requires(preun): systemd
@@ -47,7 +72,7 @@ This package contains only the core user-space programs and libraries of
%{name}.
%package desktop
-Summary: User experience components for Open VMware Tools
+Summary: User experience components for Open Virtual Machine Tools
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -57,7 +82,7 @@ This package contains only the user-space programs and libraries of
machines.
%package devel
-Summary: Development libraries for Open VMware Tools
+Summary: Development libraries for Open Virtual Machine Tools
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -71,8 +96,11 @@ VMware virtual machines.
%build
# Use -Wno-unused-local-typedefs to build with GCC 4.8
-export CFLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs"
-export CXXLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs"
+# Use -Wno-deprecated-declarations for version 9.4.0
+export CFLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs -Wno-deprecated-declarations"
+export CXXLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs -Wno-deprecated-declarations"
+# Required for version 9.4.0
+export CUSTOM_PROCPS_NAME=procps
%configure \
--without-kernel-modules \
--disable-static
@@ -89,6 +117,9 @@ chmod a-x %{buildroot}%{_sysconfdir}/pam.d/*
# Remove the DOS line endings
sed -i "s|\r||g" README
+# Remove "Encoding" key from the "Desktop Entry"
+sed -i "s|^Encoding.*$||g" %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop
+
# Remove unnecessary files from packaging
find %{buildroot}%{_libdir} -name '*.la' -delete
rm -fr %{buildroot}%{_defaultdocdir}
@@ -135,7 +166,7 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
%{_libdir}/%{name}/plugins/common/*.so
%dir %{_libdir}/%{name}/plugins/vmsvc
%{_libdir}/%{name}/plugins/vmsvc/*.so
-%{_sbindir}/mount.vmhgfs
+%exclude %{_sbindir}/mount.vmhgfs
%{_datadir}/%{name}/
%exclude /sbin/
%{_unitdir}/%{toolsdaemon}.service
@@ -155,6 +186,29 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
%{_libdir}/libvmtools.so
%changelog
+* Tue Feb 11 2014 Richard W.M. Jones <rjones@redhat.com> - 9.4.0-3
+- Only build on x86-64 for RHEL 7 (RHBZ#1054608).
+
+* Wed Dec 04 2013 Richard W.M. Jones <rjones@redhat.com> - 9.4.0-2
+- Rebuild for procps SONAME bump.
+
+* Wed Nov 06 2013 Ravindra Kumar <ravindrakumar@vmware.com> - 9.4.0-1
+- Package new upstream version open-vm-tools-9.4.0-1280544.
+- Added CUSTOM_PROCPS_NAME=procps and -Wno-deprecated-declarations
+ for version 9.4.0.
+
+* Thu Aug 22 2013 Ravindra Kumar <ravindrakumar@vmware.com> - 9.2.3-11
+- Added copyright and license text.
+- Corrected summary for all packages.
+
+* Thu Aug 08 2013 Ravindra Kumar <ravindrakumar@vmware.com> - 9.2.3-10
+- Added options for hardening build (bug 990549).
+- Excluded unwanted file mount.vmhgfs from packaging (bug 990547).
+- Removed deprecated key "Encoding" from "Desktop Entry" (bug 990552).
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.2.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Tue Jun 4 2013 Richard W.M. Jones <rjones@redhat.com> - 9.2.3-8
- RHEL 7 now includes libdnet, so re-enable it.
@@ -164,7 +218,7 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
* Mon May 06 2013 Ravindra Kumar <ravindrakumar@vmware.com> - 9.2.3-5
- Renamed source file open-vm-tools.service -> vmtoolsd.service
- to match it with the service name
+ to match it with the service name.
* Wed May 01 2013 Ravindra Kumar <ravindrakumar@vmware.com> - 9.2.3-4
- Bumped the release to pick the new service definition with