Accepting request 58050 from home:vuntz:branches:GNOME:Factory

Nice... and I like the prospect that we will be able to drop that patch soon-ish.

OBS-URL: https://build.opensuse.org/request/show/58050
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=87

gnome-control-center-bnc436206-add-to-default.patch

@@ -1,18 +0,0 @@
-Index: gnome-control-center-2.24.0.1/capplets/default-applications/gnome-default-applications.xml.in
-===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/default-applications/gnome-default-applications.xml.in
-+++ gnome-control-center-2.24.0.1/capplets/default-applications/gnome-default-applications.xml.in
-@@ -241,6 +241,13 @@
-       <icon-name>sylpheed</icon-name>
-       <run-in-terminal>false</run-in-terminal>
-     </mail-reader>
-+    <mail-reader>
-+      <_name>GroupWise</_name>
-+      <executable>groupwise</executable>
-+      <command>groupwise %s</command>
-+      <icon-name>gwclient</icon-name>
-+      <run-in-terminal>false</run-in-terminal>
-+    </mail-reader>
-   </mail-readers>
- 
-   <terminals>

gnome-control-center.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jan 13 09:57:07 CET 2011 - vuntz@opensuse.org
+
+- Add gnome-control-center-mime-scheme-handler.patch: correctly
+  handle default browser and mailer. Because of a change in how gio
+  works, the way to register default mailer and browser has changed
+  to use MIME types instead of gconf keys. The patch is based on
+  cherry-picked changes from git to the gnome-2-32 branch.
+- Drop gnome-control-center-bnc436206-add-to-default.patch:
+  groupwise should be updated to declare that it supports the
+  x-scheme-handler/mailto mime type to be added to the list of
+  mailers.
+
 -------------------------------------------------------------------
 Fri Nov 19 10:16:12 CET 2010 - vuntz@opensuse.org
 

gnome-control-center.spec

@@ -59,12 +59,12 @@ Source:         %{name}-%{version}.tar.bz2
 Patch0:         gnome-control-center-shell-common-tasks-i18n.patch
 # PATCH-FIX-UPSTREAM gnome-control-center-bnc427745-force-dpi.patch bnc427745 bgo553652 vuntz@novell.com -- Force the DPI to 96 right now to avoid big fonts.
 Patch1:         gnome-control-center-bnc427745-force-dpi.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-mime-scheme-handler.patch vuntz@opensuse.org -- Use x-scheme-handler/* mime types to set default web browser and mailer. Cherry-picked to gonme-2-32 branch from master/3.0 branch
+Patch2:         gnome-control-center-mime-scheme-handler.patch
 # PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE)
 Patch14:        gnome-control-center-system-proxy-configuration.patch
 # PATCH-FEATURE-OPENSUSE gnome-control-center-use-settings-menu.patch
 Patch28:        gnome-control-center-use-settings-menu.patch
-# PATCH-FIX-UPSTREAM gnome-control-center-bnc436206-add-to-default.patch bnc436206 sreeves@novell.com -- Add groupwise to defaults list
-Patch31:        gnome-control-center-bnc436206-add-to-default.patch
 Url:            http://www.gnome.org
 Requires:       nautilus gnome-settings-daemon gnome-menus
 Requires:       %{name}-lang = %{version}
@@ -116,10 +116,10 @@ translation-update-upstream
 gnome-patch-translation-prepare
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 #NEEDS-REBASE
 #%patch14 -p1
 %patch28
-%patch31 -p1
 gnome-patch-translation-update
 
 %build