[gnome-python2-extras] Remove and obsolete -gtkhtml2 and -gtkmozembed subpackages

[Kalev Lember]

commit 2b7dc62779bb919c917a37efff7593b99f815d72
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Sep 9 19:06:02 2011 +0300

    Remove and obsolete -gtkhtml2 and -gtkmozembed subpackages
    
    Don't build the subpackages as gtkhtml2 is retired in F16+ and xulrunner
    in F16+ has gtkmozembed support disabled.

 gnome-python2-extras.spec |   45 ++++++++-------------------------------------
 1 files changed, 8 insertions(+), 37 deletions(-)
---
diff --git a/gnome-python2-extras.spec b/gnome-python2-extras.spec
index cbca309..00d1b12 100644
--- a/gnome-python2-extras.spec
+++ b/gnome-python2-extras.spec
@@ -4,8 +4,6 @@
 %define gtk_version 2.4.0
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.10.0
-%define gtkhtml2_version 2.3.1
-%define gecko_version 6.0.2
 %define gtkspell_version 2.0.7
 %define libgda_version 3.99.9
 %define libgdl_version 2.24.0
@@ -17,7 +15,7 @@
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 Summary: Additional PyGNOME Python extension modules
@@ -28,7 +26,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: gnome-python2-gda <= 2.14.3-1
 Obsoletes: gnome-python2-gda-devel <= 2.14.3-1
 
-Obsoletes: gnome-python2-gdl < 2.25.3-31
+Obsoletes: gnome-python2-gdl < 2.25.3-34
+Obsoletes: gnome-python2-gtkhtml2 < 2.25.3-34
+Obsoletes: gnome-python2-gtkmozembed < 2.25.3-34
 
 ### Patches ###
 
@@ -41,14 +41,12 @@ Requires: gnome-python2 >= %{gnome_python_version}
 
 ### Build Dependencies ###
 
-BuildRequires: gecko-devel-unstable >= %{gecko_version}
 BuildRequires: glib2 >= %{glib_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires: gnome-python2-bonobo >= %{gnome_python_version}
 BuildRequires: gnome-python2-devel >= %{gnome_python_version}
 BuildRequires: gnome-python2-gnome >= %{gnome_python_version}
 BuildRequires: gtk2 >= %{gtk_version}
-BuildRequires: gtkhtml2-devel >= %{gtkhtml2_version}
 BuildRequires: gtkspell-devel >= %{gtkspell_version}
 BuildRequires: libbonoboui-devel
 BuildRequires: pygtk2-devel
@@ -101,25 +99,6 @@ This module contains a wrapper that allows the use of the GNOME Development
 Library (gdl) via Python.
 %endif
 
-%package -n gnome-python2-gtkhtml2
-Summary: Python bindings for interacting with gtkhtml2
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: gtkhtml2 >= %{gtkhtml2_version}
-Obsoletes: pygnome-gtkhtml
-
-%description -n gnome-python2-gtkhtml2
-This module contains a wrapper that allows the use of gtkhtml2 via Python.
-
-%package -n gnome-python2-gtkmozembed
-Summary: Python bindings for interacting with gtkmozembed
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: gecko-libs >= %{gecko_version}
-
-%description -n gnome-python2-gtkmozembed
-This module contains a wrapper that allows the use of gtkmozembed via Python.
-
 %package -n gnome-python2-gtkspell
 Summary: Python bindings for interacting with gtkspell
 Group: Development/Languages
@@ -158,7 +137,7 @@ icons via Python.
 %define gdl_flags --disable-gdl
 %endif
 
-%configure --with-gtkmozembed=mozilla --enable-docs %gda_flags %gdl_flags
+%configure --enable-docs %gda_flags %gdl_flags
 make %{?_smp_mflags}
 
 %install
@@ -195,17 +174,6 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gdl.so
 %endif
 
-%files -n gnome-python2-gtkhtml2
-%defattr(-,root,root,-)
-%{python_sitearch}/gtk-2.0/gtkhtml*
-%defattr(644,root,root,755)
-%doc examples/gtkhtml2/*
-
-%files -n gnome-python2-gtkmozembed
-%defattr(-,root,root,-)
-%{python_sitearch}/gtk-2.0/gtkmozembed.so
-%{_datadir}/gtk-doc/html/pygtkmozembed
-
 %files -n gnome-python2-gtkspell
 %defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gtkspell.so
@@ -218,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/egg/*
 
 %changelog
+* Fri Sep 09 2011 Kalev Lember <kalevlember at gmail.com> - 2.25.3-34
+- Remove and obsolete -gtkhtml2 and -gtkmozembed subpackages
+
 * Tue Sep 06 2011 Jan Horak <jhorak at redhat.com> - 2.25.3-33
 - Rebuild against newer gecko