[gnome-python2-desktop] Undo a commit that should have gone to f14

[Matthias Clasen]

commit 81eb73e7b65f597f86c335c432e5be95a389440a
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Aug 12 13:04:25 2010 -0400

    Undo a commit that should have gone to f14

 gnome-python2-desktop.spec |   67 +++++++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 31 deletions(-)
---
diff --git a/gnome-python2-desktop.spec b/gnome-python2-desktop.spec
index c182614..2851014 100644
--- a/gnome-python2-desktop.spec
+++ b/gnome-python2-desktop.spec
@@ -28,7 +28,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.31.1
-Release: 4%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -44,8 +44,8 @@ Requires: gnome-python2-canvas >= %{gnome_python_version}
 
 ### Build Dependencies ###
 
-BuildRequires: brasero-devel >= %{brasero_version}
-BuildRequires: evince-devel >= %{evince_version}
+#BuildRequires: brasero-devel >= %{brasero_version}
+#BuildRequires: evince-devel >= %{evince_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: glib2-devel >= %{glib_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
@@ -90,25 +90,25 @@ Requires: gnome-python2-gnome
 This module contains a wrapper that allows GNOME Panel applets to be
 written in Python.
 
-%package -n gnome-python2-brasero
-Summary: Python bindings for interacting with brasero
-License: LGPLv2
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: brasero-libs >= %{brasero_version}
+#package -n gnome-python2-brasero
+#Summary: Python bindings for interacting with brasero
+#License: LGPLv2
+#Group: Development/Languages
+#Requires: %{name} = %{version}-%{release}
+#Requires: brasero-libs >= %{brasero_version}
 
-%description -n gnome-python2-brasero
-This module contains a wrapper that allows the use of brasero via Python.
+#description -n gnome-python2-brasero
+#This module contains a wrapper that allows the use of brasero via Python.
 
-%package -n gnome-python2-evince
-Summary: Python bindings for interacting with evince
-License: LGPLv2
-Group: Development/Languages
-Requires: %{name} = %{version}-%{release}
-Requires: evince-libs >= %{evince_version}
+#package -n gnome-python2-evince
+#Summary: Python bindings for interacting with evince
+#License: LGPLv2
+#Group: Development/Languages
+#Requires: %{name} = %{version}-%{release}
+#Requires: evince-libs >= %{evince_version}
 
-%description -n gnome-python2-evince
-This module contains a wrapper that allows the use of evince via Python.
+#description -n gnome-python2-evince
+#This module contains a wrapper that allows the use of evince via Python.
 
 %package -n gnome-python2-evolution
 Summary: Python bindings for interacting with evolution-data-server
@@ -229,10 +229,15 @@ via Python.
 %patch0 -p1 -b .flags
 
 %build
-%configure --enable-metacity
+# evince, brasero and mediaprofiles are disabled because these things have
+# been ported to GTK+3. It's not practical to mix GTK+2 and GTK+3 bindings
+# in gnome-python2-desktop, so for now we'll just have to disable the GTK+3
+# stuff. - AdamW 2010/07
+%configure --enable-metacity --disable-evince --disable-braseromedia --disable-braseroburn --disable-mediaprofiles
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
@@ -240,6 +245,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/gksu
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/bugbuddy.*
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS README COPYING COPYING.GPL COPYING.LGPL
@@ -251,14 +259,14 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/bugbuddy.*
 %dir %{python_sitearch}/gtk-2.0/gnome/applet.*
 %{python_sitearch}/gtk-2.0/gnomeapplet.so
 
-files -n gnome-python2-brasero
-defattr(-,root,root,-)
-{python_sitearch}/gtk-2.0/braseroburn.so
-{python_sitearch}/gtk-2.0/braseromedia.so
+#files -n gnome-python2-brasero
+#defattr(-,root,root,-)
+#{python_sitearch}/gtk-2.0/braseroburn.so
+#{python_sitearch}/gtk-2.0/braseromedia.so
 
-files -n gnome-python2-evince
-defattr(-,root,root,-)
-{python_sitearch}/gtk-2.0/evince.so
+#files -n gnome-python2-evince
+#defattr(-,root,root,-)
+#{python_sitearch}/gtk-2.0/evince.so
 
 %files -n gnome-python2-evolution
 %defattr(-,root,root,-)
@@ -294,7 +302,7 @@ defattr(-,root,root,-)
 %files -n gnome-python2-totem
 %defattr(-,root,root,-)
 %ifnarch s390 s390x
-{python_sitearch}/gtk-2.0/mediaprofiles.so
+#{python_sitearch}/gtk-2.0/mediaprofiles.so
 %endif
 %{python_sitearch}/gtk-2.0/totem
 
@@ -311,9 +319,6 @@ defattr(-,root,root,-)
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
-* Thu Aug 12 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.1-4
-- Bring back evince, brasero and media profiles for F14
-
 * Tue Jul 27 2010 Adam Williamson <awilliam at redhat.com> - 2.31.1-3
 - gnome-media-profiles support also broken due to gtk3 port, so
   disable it