Fix FTBFS g_info redefine (RHBZ #1063847)

This commit is contained in:
Simone Caronni 2014-02-18 08:29:00 +01:00
parent 0cd2a36be2
commit 0225d0b56b
2 changed files with 20 additions and 1 deletions

14
g_info_redefine.patch Normal file
View File

@ -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
/*

View File

@ -27,13 +27,14 @@
Name: open-vm-tools Name: open-vm-tools
Version: %{toolsversion} Version: %{toolsversion}
Release: 4%{?dist} Release: 5%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
Group: Applications/System Group: Applications/System
License: GPLv2 License: GPLv2
URL: http://%{name}.sourceforge.net/ URL: http://%{name}.sourceforge.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/stable-%{majorversion}.x/%{name}-%{version}-%{toolsbuild}.tar.gz Source0: http://sourceforge.net/projects/%{name}/files/%{name}/stable-%{majorversion}.x/%{name}-%{version}-%{toolsbuild}.tar.gz
Source1: %{toolsdaemon}.service Source1: %{toolsdaemon}.service
Patch0: g_info_redefine.patch
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%else %else
@ -93,6 +94,7 @@ VMware virtual machines.
%prep %prep
%setup -q -n %{name}-%{version}-%{toolsbuild} %setup -q -n %{name}-%{version}-%{toolsbuild}
%patch0 -p1 -b .g_info
%build %build
# Use -Wno-unused-local-typedefs to build with GCC 4.8 # 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 %{_libdir}/libvmtools.so
%changelog %changelog
* Tue Feb 18 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 9.4.0-5
- Fix FTBFS g_info redefine (RHBZ #1063847)
* Fri Feb 14 2014 David Tardon <dtardon@redhat.com> - 9.4.0-4 * Fri Feb 14 2014 David Tardon <dtardon@redhat.com> - 9.4.0-4
- rebuild for new ICU - rebuild for new ICU