rpms/gnome-python2/OLPC-3 no-bonobo-activation.patch, NONE, 1.1 gnome-python2.spec, 1.20, 1.21

[Daniel Drake (dsd)]

Author: dsd

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

Modified Files:
	gnome-python2.spec 
Added Files:
	no-bonobo-activation.patch 
Log Message:
remove dependency on bonobo, modularize libgnome bindings


no-bonobo-activation.patch:

--- NEW FILE no-bonobo-activation.patch ---
Index: gnome-python-2.22.1/configure.ac
===================================================================
--- gnome-python-2.22.1.orig/configure.ac
+++ gnome-python-2.22.1/configure.ac
@@ -243,8 +243,7 @@ fi
 dnl should we build the gnomevfs python module bridge?
 AC_ARG_BINDING([pyvfsmodule], [ON], [bridge])
 if $build_pyvfsmodule; then
-  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)
 fi


Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/OLPC-3/gnome-python2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-python2.spec	17 Jun 2008 04:50:27 -0000	1.20
+++ gnome-python2.spec	25 Jul 2008 16:01:53 -0000	1.21
@@ -1,4 +1,5 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define minimal_build 1
 
 # Last updated for 2.22.0
 # The order here corresponds to that in configure.ac,
@@ -21,17 +22,17 @@
 
 Name: gnome-python2
 Version: 2.22.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: The sources for the PyGNOME Python extension module
 URL: http://download.gnome.org/sources/gnome-python/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source: http://download.gnome.org/sources/gnome-python/2.22/gnome-python-%{version}.tar.bz2
+Patch0: no-bonobo-activation.patch
 
 ### Dependencies ###
 
-Requires: gnome-python2-bonobo
 Requires: gnome-python2-gnomevfs
 Requires: pygtk2 >= %{pygtk_version}
 
@@ -44,6 +45,7 @@
 BuildRequires: pygtk2-devel >= %{pygtk_version}
 BuildRequires: pyorbit-devel >= %{pyorbit_version}
 BuildRequires: python2-devel >= %{python_version}
+BuildRequires: libtool
 
 Obsoletes: gnome-python2-nautilus
 
@@ -55,6 +57,15 @@
 base GNOME libraries, so you have access to more widgets, a simple
 configuration interface, and metadata support.
 
+%package gnome
+Summary: Python bindings for libgnome
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description gnome
+This module contains a wrapper that makes libgnome functionality available
+from Python.
+
 %package capplet
 Summary: Python bindings for GNOME Panel applets.
 Group: Development/Languages
@@ -103,7 +114,10 @@
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
 Requires: gnome-vfs2 >= %{libgnomevfs_version}
+
+%if %{minimal_build} == 0
 Requires: libbonobo >= %{libbonobo_version}
+%endif
 
 %description gnomevfs
 This module contains a wrapper that allows the use of gnome-vfs via python.
@@ -122,9 +136,15 @@
 
 %prep
 %setup -q -n gnome-python-%{version}
+%patch0 -p1
+autoreconf -f -i
 
 %build
+%if %{minimal_build} == 0
 %configure
+%else
+%configure --disable-gnomevfsbonobo
+%endif
 make
 
 %install
@@ -139,17 +159,23 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS
 %dir %{python_sitearch}/gtk-2.0/gnome/
+%dir %{_datadir}/pygtk/2.0/defs
+%dir %{_datadir}/pygtk/2.0/argtypes
+
+%files gnome
 %{python_sitearch}/gtk-2.0/gnome/__init__.*
 %{python_sitearch}/gtk-2.0/gnome/_gnome.so
 %{python_sitearch}/gtk-2.0/gnome/ui.so
-%{_datadir}/pygtk/
+%{_datadir}/pygtk/2.0/defs/ui.defs
+%{_datadir}/pygtk/2.0/defs/gnome.defs
+%{_datadir}/pygtk/2.0/defs/gnome-types.defs
 
 %files canvas
 %defattr(-,root,root,-)
 %dir %{python_sitearch}/gtk-2.0/gnome/
-%{python_sitearch}/gtk-2.0/gnome/__init__.*
 %{python_sitearch}/gtk-2.0/gnome/canvas.*
 %{python_sitearch}/gtk-2.0/gnomecanvas.so
+%{_datadir}/pygtk/2.0/defs/canvas.defs
 %defattr(644,root,root,755)
 %doc examples/canvas/*
 
@@ -158,12 +184,16 @@
 %dir %{python_sitearch}/gtk-2.0/bonobo/
 %{python_sitearch}/gtk-2.0/bonobo/__init__.*
 %{python_sitearch}/gtk-2.0/bonobo/*.so
+%{_datadir}/pygtk/2.0/defs/bonobo*.defs
+%{_datadir}/pygtk/2.0/argtypes/bonobo*
 %defattr(644,root,root,755)
 %doc examples/bonobo/*
 
 %files gconf
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gconf.so
+%{_datadir}/pygtk/2.0/defs/gconf.defs
+%{_datadir}/pygtk/2.0/argtypes/gconf*
 %defattr(644,root,root,755)
 %doc examples/gconf/*
 
@@ -175,6 +205,7 @@
 %dir %{_datadir}/gtk-doc/
 %dir %{_datadir}/gtk-doc/html/
 %doc %{_datadir}/gtk-doc/html/pygnomevfs
+
 %defattr(644,root,root,755)
 %doc examples/vfs/*
 
@@ -191,6 +222,10 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Fri Jul 25 2008 Daniel Drake <dsd at laptop.org> - 2.22.1-3.olpc3
+- Remove gnomevfs dependency on libbonobo
+- Modularize libgnome bindings
+
 * Tue Jun 17 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.1-2.fc9
 - Fix directory ownership (RH bug #451754).