[libjingle/f14/master] fix linux.cc to have LINUX defined by config.h

[Tom Callaway]

commit e22bcf82e7317fa6de564aabfafbbaa882af56b9
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Jan 13 13:04:35 2011 -0500

    fix linux.cc to have LINUX defined by config.h

 libjingle-0.5.1-config-linux.patch |   27 +++++++++++++++++++++++++++
 libjingle.spec                     |    8 +++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/libjingle-0.5.1-config-linux.patch b/libjingle-0.5.1-config-linux.patch
new file mode 100644
index 0000000..61bc71c
--- /dev/null
+++ b/libjingle-0.5.1-config-linux.patch
@@ -0,0 +1,27 @@
+diff -up libjingle-0.5.1/talk/base/linux.cc.config libjingle-0.5.1/talk/base/linux.cc
+--- libjingle-0.5.1/talk/base/linux.cc.config	2011-01-13 11:49:11.524655003 -0500
++++ libjingle-0.5.1/talk/base/linux.cc	2011-01-13 11:49:22.421655008 -0500
+@@ -1,10 +1,9 @@
+ // Copyright 2008 Google Inc. All Rights Reserved.
+ 
+ //
+-
+-#ifdef LINUX
+ #include "talk/base/linux.h"
+ 
++#ifdef LINUX
+ #include <errno.h>
+ #include <sys/utsname.h>
+ 
+diff -up libjingle-0.5.1/talk/base/linux.h.config libjingle-0.5.1/talk/base/linux.h
+--- libjingle-0.5.1/talk/base/linux.h.config	2010-11-08 18:01:43.000000000 -0500
++++ libjingle-0.5.1/talk/base/linux.h	2011-01-13 11:39:45.990654999 -0500
+@@ -4,6 +4,8 @@
+ #ifndef TALK_BASE_LINUX_H_
+ #define TALK_BASE_LINUX_H_
+ 
++#include "config.h"
++
+ #ifdef LINUX
+ #include <string>
+ #include <map>
diff --git a/libjingle.spec b/libjingle.spec
index ecc3825..d06d987 100644
--- a/libjingle.spec
+++ b/libjingle.spec
@@ -1,6 +1,6 @@
 Name:           libjingle
 Version:        0.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GoogleTalk implementation of Jingle
 Group:          System Environment/Libraries
 License:        BSD
@@ -43,6 +43,8 @@ Patch11:        libjingle-0.5.1-fixconflict.patch
 Patch12:        libjingle-0.5.1-64bittypes.patch
 # From Chromium, make qname threadsafe
 Patch13:	libjingle-0.5.1-qname-threadsafe.patch
+# Make sure linux.h/linux.cc pulls in config.h for LINUX define
+Patch14:	libjingle-0.5.1-config-linux.patch
 
 BuildRequires:	libtool, autoconf, automake
 BuildRequires:	openssl-devel
@@ -91,6 +93,7 @@ developing applications that use %{name}.
 %patch11 -p1 -b .fixconflict
 %patch12 -p1 -b .64bit
 %patch13 -p1 -b .threadsafe
+%patch14 -p1 -b .config
 
 touch NEWS ChangeLog
 autoreconf -i
@@ -135,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 13 2011 Tom Callaway <spot at fedoraproject.org> - 0.5.1-4
+- fix linux.h so that LINUX define is pulled in from config.h
+
 * Fri Dec 10 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-3
 - apply change from Chromium to make qname threadsafe