rpms/gnome-python2/OLPC-2 gnome-python-2.18.1-optional-libgnome.patch, NONE, 1.1

[John (J5) Palmieri (johnp)]

Author: johnp

Update of /cvs/pkgs/rpms/gnome-python2/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31198

Added Files:
	gnome-python-2.18.1-optional-libgnome.patch 
Log Message:
- Patch out libgnome bits
- Build for olpc-2


gnome-python-2.18.1-optional-libgnome.patch:

--- NEW FILE gnome-python-2.18.1-optional-libgnome.patch ---
--- gnome-python-2.18.1/Makefile.am.optional-libgnome	2007-01-03 17:52:30.000000000 -0500
+++ gnome-python-2.18.1/Makefile.am	2007-07-03 15:46:16.000000000 -0400
@@ -1,6 +1,14 @@
 AUTOMAKE_OPTIONS = 1.6
 
-SUBDIRS = gnome bonobo docs
+SUBDIRS = docs
+
+if BUILD_GNOME
+SUBDIRS += gnome
+endif
+
+if BUILD_BONOBO
+SUBDIRS += bonobo
+endif
 
 if BUILD_GCONF
 SUBDIRS += gconf
--- gnome-python-2.18.1/configure.ac.optional-libgnome	2007-04-09 16:10:51.000000000 -0400
+++ gnome-python-2.18.1/configure.ac	2007-07-03 17:53:21.000000000 -0400
@@ -118,13 +118,16 @@ if test -n "$export_dynamic"; then
   GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
-PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= libgnome_required_version,,
-  [AC_MSG_ERROR(libgnome-2.0 is required.)])
+PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= libgnome_required_version,
+  build_gnome=true,
+  build_gnome=false)
+
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
 if test -n "$export_dynamic"; then
   GNOME_LIBS=`echo $GNOME_LIBS | sed -e "s/$export_dynamic//"`
 fi
+AM_CONDITIONAL(BUILD_GNOME, $build_gnome)
 
 dnl ****************************************************************************
 dnl * Check for prctl() or setproctitle()
@@ -190,8 +193,7 @@ fi
 
 dnl should we build the gnomevfs python module bridge?
 build_pyvfsmodule=false
-PKG_CHECK_MODULES(GNOME_VFS_MODULE, [gnome-vfs-module-2.0 >= libgnomevfs_required_version dnl
-                                     bonobo-activation-2.0 >= bonobo_activation_required_version],
+PKG_CHECK_MODULES(GNOME_VFS_MODULE, [gnome-vfs-module-2.0 >= libgnomevfs_required_version],
   build_pyvfsmodule=true,
   build_pyvfsmodule=false)