diff --git a/g_info_redefine.patch b/g_info_redefine.patch new file mode 100644 index 0000000..9985e61 --- /dev/null +++ b/g_info_redefine.patch @@ -0,0 +1,14 @@ +diff -uNr open-vm-tools-9.4.0-1280544.orig/lib/include/vmware/tools/log.h open-vm-tools-9.4.0-1280544/lib/include/vmware/tools/log.h +--- open-vm-tools-9.4.0-1280544.orig/lib/include/vmware/tools/log.h 2013-09-23 19:51:10.000000000 +0400 ++++ open-vm-tools-9.4.0-1280544/lib/include/vmware/tools/log.h 2014-02-18 10:56:50.368604176 +0400 +@@ -134,7 +134,9 @@ + ******************************************************************************* + */ + +-#define g_info(fmt, ...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, fmt, ## __VA_ARGS__) ++#if !defined(g_info) ++# define g_info(fmt, ...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, fmt, ## __VA_ARGS__) ++#endif + + + /* diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 66f754e..068aa10 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -27,13 +27,14 @@ Name: open-vm-tools Version: %{toolsversion} -Release: 4%{?dist} +Release: 5%{?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 +Patch0: g_info_redefine.patch %if 0%{?rhel} >= 7 ExclusiveArch: x86_64 %else @@ -93,6 +94,7 @@ VMware virtual machines. %prep %setup -q -n %{name}-%{version}-%{toolsbuild} +%patch0 -p1 -b .g_info %build # Use -Wno-unused-local-typedefs to build with GCC 4.8 @@ -186,6 +188,9 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service %{_libdir}/libvmtools.so %changelog +* Tue Feb 18 2014 Igor Gnatenko - 9.4.0-5 +- Fix FTBFS g_info redefine (RHBZ #1063847) + * Fri Feb 14 2014 David Tardon - 9.4.0-4 - rebuild for new ICU