disable audacious support

Conflicts:
	.gitignore

conky-1.8.1-outside.patch

@@ -0,0 +1,14 @@
+diff -up conky-1.8.1/lua/libcairo.c.outside conky-1.8.1/lua/libcairo.c
+--- conky-1.8.1/lua/libcairo.c.outside	2010-10-05 23:29:51.000000000 +0200
++++ conky-1.8.1/lua/libcairo.c	2010-10-06 17:09:47.000000000 +0200
+@@ -20,6 +20,10 @@ TOLUA_API int  tolua_cairo_open (lua_Sta
+ #include <X11/Xlib.h>
+ #include "libcairo-helper.h"
+ 
++#ifndef tolua_outside
++#define tolua_outside
++#endif
++
+ /* function to release collected object via destructor */
+ #ifdef __cplusplus
+ 

conky.spec

@@ -1,5 +1,5 @@
 %bcond_without alsa
-%bcond_without audacious
+%bcond_with audacious
 %bcond_without curl
 %bcond_without imlib
 %bcond_without lua
@@ -15,15 +15,17 @@
 
 Name:           conky 
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A system monitor for X 
 
 Group:          User Interface/X
 License:        GPLv3+
 URL:            http://conky.sf.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         conky-1.8.1-outside.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  glib2-devel
 BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXdamage-devel
@@ -46,6 +48,7 @@ It just keeps on given'er. Yeah.
 
 %prep
 %setup -q
+%patch0 -p1 -b .outside
 
 for i in AUTHORS; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 10 2011 Miroslav Lichvar <mlichvar@redhat.com> - 1.8.1-2
+- disable audacious support
+
 * Wed Oct 06 2010 Miroslav Lichvar <mlichvar@redhat.com> - 1.8.1-1
 - update to 1.8.1