gnumeric r16985 - trunk

[mortenw svn gnome org]

Author: mortenw
Date: Sun Nov 30 18:57:30 2008
New Revision: 16985
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16985&view=rev

Log:
Drop gconf dep.  We don't call it directly.
Clean up deps.



Modified:
   trunk/README
   trunk/configure.in
   trunk/gnumeric.spec.in

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Sun Nov 30 18:57:30 2008
@@ -17,7 +17,7 @@
 	glib		>= 2.6.0	libglib2.0-dev
 	gtk+		>= 2.10.0	libgtk2.0-dev
 	libgsf		>= 1.14.6	libgsf-1-dev
-	libgoffice	>= 0.5.1	libgoffice-0-5-dev
+	libgoffice	>= 0.7.3	libgoffice-0-5-dev
 	libglade	>= 2.3.6	libglade2-dev
 	gnome-xml   	>= 2.4.12	libxml2-dev
 	pango		>= 1.8.1	libpango1.0-dev

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Nov 30 18:57:30 2008
@@ -159,10 +159,11 @@
 "
 
 gnumeric_gtk_reqs="$libspreadsheet_gtk_reqs"
+
 libspreadsheet_gnome_reqs="
-	gconf-2.0
 	libbonobo-2.0		>= 2.2.0
 "
+
 gnumeric_gnome_reqs="$libspreadsheet_gnome_reqs
 	libgnomeui-2.0		>= 2.0.0
 	libbonoboui-2.0		>= 2.2.0

Modified: trunk/gnumeric.spec.in
==============================================================================
--- trunk/gnumeric.spec.in	(original)
+++ trunk/gnumeric.spec.in	Sun Nov 30 18:57:30 2008
@@ -1,5 +1,7 @@
+# This file is basically not maintained.  Use as inspiration only.
+
 # conditional features selected using --with <foo> or --without <foo>
-%{!?_with_bonobo:	%{!?_without_bonobo: %define _without_bonobo --without-bonobo}}
+%{!?_with_gnome:	%{!?_without_gnome: %define _without_gnome --without-gnome}}
 %{!?_with_gda:		%{!?_without_gda: %define _without_gda --without-gda}}
 %{!?_with_guile:	%{!?_without_guile: %define _without_guile --without-guile}}
 %{!?_with_long_double:	%{!?_without_long_double: %define _without_long_double --without-long-double}}
@@ -22,12 +24,11 @@
 BuildRequires:	gtk2-devel		>= 2.10.0
 BuildRequires:	libxml2-devel		>= 2.4.12
 BuildRequires:	libglade2-devel		>= 2.3.6
+%if %{?_with_gnome:1}%{!?_with_gnome:0}
 BuildRequires:	libgnome-devel		>= 2.0.0
 BuildRequires:	libgnomeui-devel	>= 2.0.0
-# What about libart requirement?
-%if %{?_with_bonobo:1}%{!?_with_bonobo:0}
-BuildRequires: libbonobo-devel		>= 2.0.0
-BuildRequires: libbonoboui-devel	>= 2.0.0
+BuildRequires:  libbonobo-devel		>= 2.0.0
+BuildRequires:  libbonoboui-devel	>= 2.0.0
 %endif
 %{?_with_gda:BuildRequires:	libgda-devel		>= 1.0.1}
 %{?_with_guile:BuildRequires:	guile-devel		>= 1.5}
@@ -59,7 +60,7 @@
 
 %build
 %configure \
-  %{?_with_bonobo} %{?_without_bonobo} \
+  %{?_with_gnome} %{?_without_gnome} \
   %{?_with_gda} %{?_without_gda} \
   %{?_with_guile} %{?_without_guile} \
   %{?_with_long_double} %{?_without_long_double} \