From 1b7e779cfed2361bfab269fbef3c1fa013865f1e Mon Sep 17 00:00:00 2001
From: sandmann <sandmann@fedoraproject.org>
Date: Mar 19 2007 23:49:25 +0000
Subject: Comment out gnome-common macros from configure.ac


---

diff --git a/gnome-desktop-2.18.0-gnome-bg.patch b/gnome-desktop-2.18.0-gnome-bg.patch
index 8ceb614..99a1f7d 100644
--- a/gnome-desktop-2.18.0-gnome-bg.patch
+++ b/gnome-desktop-2.18.0-gnome-bg.patch
@@ -1,5 +1,22 @@
---- gnome-desktop-2.18.0/libgnome-desktop/gnome-bg.c.gnome-bg	2007-03-19 18:42:51.000000000 -0400
-+++ gnome-desktop-2.18.0/libgnome-desktop/gnome-bg.c	2007-03-19 18:42:44.000000000 -0400
+--- gnome-desktop-2.18.0/configure.in.gnome-bg	2007-03-19 19:43:15.000000000 -0400
++++ gnome-desktop-2.18.0/configure.in	2007-03-19 19:43:24.000000000 -0400
+@@ -51,10 +51,10 @@
+ AC_SUBST(GNOME_DISTRIBUTOR)
+ AC_SUBST(GNOME_DATE)
+ 
+-GNOME_COMMON_INIT
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
++#GNOME_COMMON_INIT
++#GNOME_DEBUG_CHECK
++#GNOME_COMPILE_WARNINGS([maximum])
++#GNOME_MAINTAINER_MODE_DEFINES
+ 
+ # As a special favour for vuntz, support --disable-deprecations
+ 
+--- /dev/null	2007-03-05 16:01:59.843465905 -0500
++++ gnome-desktop-2.18.0/libgnome-desktop/gnome-bg.c	2007-03-19 18:46:22.000000000 -0400
 @@ -0,0 +1,1679 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
 +   
@@ -1680,8 +1697,8 @@
 +	
 +	return FALSE;
 +}
---- gnome-desktop-2.18.0/libgnome-desktop/Makefile.am.gnome-bg	2007-03-19 18:41:53.000000000 -0400
-+++ gnome-desktop-2.18.0/libgnome-desktop/Makefile.am	2007-03-19 18:42:19.000000000 -0400
+--- gnome-desktop-2.18.0/libgnome-desktop/Makefile.am.gnome-bg	2007-03-12 18:18:57.000000000 -0400
++++ gnome-desktop-2.18.0/libgnome-desktop/Makefile.am	2007-03-19 18:46:22.000000000 -0400
 @@ -18,7 +18,8 @@
  libgnome_desktop_2_la_SOURCES = \
  	gnome-desktop-item.c	\
@@ -1692,8 +1709,8 @@
  
  libgnome_desktop_2_la_LIBADD = \
  	$(GNOME_DESKTOP_LIBS)
---- gnome-desktop-2.18.0/libgnome-desktop/libgnomeui/Makefile.am.gnome-bg	2007-03-19 18:42:03.000000000 -0400
-+++ gnome-desktop-2.18.0/libgnome-desktop/libgnomeui/Makefile.am	2007-03-19 18:42:19.000000000 -0400
+--- gnome-desktop-2.18.0/libgnome-desktop/libgnomeui/Makefile.am.gnome-bg	2007-03-12 18:18:57.000000000 -0400
++++ gnome-desktop-2.18.0/libgnome-desktop/libgnomeui/Makefile.am	2007-03-19 18:46:22.000000000 -0400
 @@ -1,4 +1,5 @@
  libgnomeui_desktopdir = $(includedir)/gnome-desktop-2.0/libgnomeui
  libgnomeui_desktop_HEADERS = \
@@ -1701,8 +1718,8 @@
 -	gnome-hint.h
 +	gnome-hint.h       \
 +	gnome-bg.h
---- gnome-desktop-2.18.0/libgnome-desktop/libgnomeui/gnome-bg.h.gnome-bg	2007-03-19 18:43:41.000000000 -0400
-+++ gnome-desktop-2.18.0/libgnome-desktop/libgnomeui/gnome-bg.h	2007-03-19 18:43:36.000000000 -0400
+--- /dev/null	2007-03-05 16:01:59.843465905 -0500
++++ gnome-desktop-2.18.0/libgnome-desktop/libgnomeui/gnome-bg.h	2007-03-19 18:46:22.000000000 -0400
 @@ -0,0 +1,99 @@
 +/* gnome-bg.h - 
 +
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index ba032f4..268989a 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -31,6 +31,7 @@ Obsoletes: gnome-core gnome-core-devel
 Provides: gnome-core
 
 BuildRequires: autoconf automake libtool
+BuildRequires: intltool, autoconf, automake
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}