rpms/gnome-python2/OLPC-2 gnome-python2.spec,1.5,1.6

[John (J5) Palmieri (johnp)]

Author: johnp

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

Modified Files:
	gnome-python2.spec 
Log Message:
- Patch out libgnome bits
- Build for olpc-2



Index: gnome-python2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2/OLPC-2/gnome-python2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-python2.spec	9 Apr 2007 20:42:02 -0000	1.5
+++ gnome-python2.spec	3 Jul 2007 23:00:59 -0000	1.6
@@ -7,27 +7,30 @@
 
 Name: gnome-python2
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
 Summary: The sources for the PyGNOME Python extension module
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-python/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source: gnome-python-%{version}.tar.bz2
+Patch1: gnome-python-2.18.1-optional-libgnome.patch
 
 ### Dependencies ###
 
-Requires: gnome-python2-bonobo
 Requires: gnome-python2-gnomevfs
 
 ### Build Dependencies ###
 
-BuildRequires: libbonobo-devel >= 2.0.0
-BuildRequires: libbonoboui-devel >= 2.0.0
-BuildRequires: libgnomeui-devel
 BuildRequires: pygtk2-devel >= 2.4.0
-BuildRequires: pyorbit-devel >= 2.0.1
 BuildRequires: python2-devel >= 2.3.0
+BuildRequires: gnome-vfs2-devel
+BuildRequires: libgnomecanvas-devel
+BuildRequires: GConf2-dbus-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gtk2-devel
+BuildRequires: libtool
 
 %if %{build_zvt}
 BuildRequires: libzvt-devel >= 2.0.0
@@ -43,15 +46,6 @@
 base GNOME libraries, so you have access to more widgets, a simple
 configuration interface, and metadata support.
 
-%package capplet
-Summary: Python bindings for GNOME Panel applets.
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description capplet
-This module contains a wrapper that allows GNOME Control Center
-capplets to be in Python.
-
 %package canvas
 Summary: Python bindings for the GNOME Canvas.
 Group: Development/Languages
@@ -64,37 +58,11 @@
 This module contains a wrapper that allows use of the GNOME Canvas
 in Python.
 
-%package zvt
-Summary: Python bindings for the ZVT terminal widget.
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: gtk2 >= 2.0.0
-Requires: libgnomecanvas >= 2.0.0
-Requires: libzvt >= 2.0.0
-Requires: pygtk2 >= 2.0.0
-
-%description zvt
-This module contains a wrapper that allows use of the ZVT terminal
-widget in Python.
-
-%package bonobo
-Summary: Python bindings for interacting with bonobo.
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: bonobo-activation >= 1.0.0
-Requires: libbonobo >= 2.0.0
-Requires: libbonoboui >= 2.0.0
-Requires: pyorbit >= 2.0.1
-
-%description bonobo
-This module contains a wrapper that allows the creation of bonobo
-components and the embedding of bonobo components in Python.
-
 %package gconf
 Summary: Python bindings for interacting with GConf
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
-Requires: GConf2 >= 1.1.10
+Requires: GConf2-dbus >= 1.1.10
 
 %description gconf
 This module contains a wrapper that allows the use of GConf via Python.
@@ -123,6 +91,8 @@
 
 %prep
 %setup -q -n gnome-python-%{version}
+%patch1 -p1 -b .optional-libgnome
+autoreconf
 
 %build
 %configure
@@ -133,44 +103,27 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
 
+#copy some files in the gnome directory even though we are not building libgnome
+./install-sh -d $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/gnome
+./install-sh gnome/vfs.* $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/gnome
+./install-sh gnome/canvas.* $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/gnome
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS
-%dir %{python_sitearch}/gtk-2.0/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/argtypes
 
 %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
 %defattr(644,root,root,755)
 %doc examples/canvas/*
 
-%if %{build_zvt}
-%files zvt
-%defattr(-,root,root,-)
-%dir %{python_sitearch}/gtk-2.0/gnome/
-%{python_sitearch}/gtk-2.0/gnome/__init__.*
-%{python_sitearch}/gtk-2.0/zvt.so
-%defattr(644,root,root,755)
-%endif
-
-%files bonobo
-%defattr(-,root,root,-)
-%dir %{python_sitearch}/gtk-2.0/bonobo/
-%{python_sitearch}/gtk-2.0/bonobo/__init__.*
-%{python_sitearch}/gtk-2.0/bonobo/*.so
-%defattr(644,root,root,755)
-%doc examples/bonobo/*
-
 %files gconf
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gconf.so
@@ -188,19 +141,17 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/gnome-python-2.0
-%{_libdir}/pkgconfig/gnome-python-2.0.pc
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/pygtk/2.0/defs/*.defs
 
-# old versions did not have .pyc and .pyo files in their file list
-# remove them now, or bad things will now happen because of the new
-# paths.  This trigger must remain until upgrading from RHL 8.0 is no 
-# longer supported.
-%triggerun bonobo -- gnome-python2-bonobo < 1.99.14-5
-rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
-* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.1-1.fc7
-- Update to 2.18.1
+* Tue Jul 03 2007 John (J5) Palmieri <johnp at redhat.com> - 2.18.1-2
+- Patch out libgnome bits
+- Build for olpc-2
 
+* Mon Apr 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.1-1.fc7
+- Update to 2.18.12
 * Mon Mar 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.18.0-1.fc7
 - Update to 2.18.0