[xfce-utils] Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621

[Kevin Fenzi]

commit fe03181b179a81c9e9aab85af0851ec80d2b87a2
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Dec 9 16:17:52 2011 -0700

    Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621

 xfce-utils-4.8.3-46-migration-gnome.patch |   10 ++++++++++
 xfce-utils.spec                           |    9 ++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xfce-utils-4.8.3-46-migration-gnome.patch b/xfce-utils-4.8.3-46-migration-gnome.patch
new file mode 100644
index 0000000..80bd0ae
--- /dev/null
+++ b/xfce-utils-4.8.3-46-migration-gnome.patch
@@ -0,0 +1,10 @@
+diff -Nur xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in xfce-utils-4.8.3/scripts/xfconf-migration-4.6.desktop.in
+--- xfce-utils-4.8.3.orig/scripts/xfconf-migration-4.6.desktop.in	2011-12-09 16:02:58.689214217 -0700
++++ xfce-utils-4.8.3/scripts/xfconf-migration-4.6.desktop.in	2011-12-09 16:04:31.347779838 -0700
+@@ -5,4 +5,6 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=false
++X-GNOME-Autostart-enabled=false
++OnlyShowIn=XFCE;
+ Categories=Utility;
diff --git a/xfce-utils.spec b/xfce-utils.spec
index 6f3dc4d..a4c8731 100644
--- a/xfce-utils.spec
+++ b/xfce-utils.spec
@@ -3,7 +3,7 @@
 
 Name:           xfce-utils
 Version:        4.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for the Xfce Desktop Environment
 
 Group:          User Interface/Desktops
@@ -15,6 +15,9 @@ Patch1:         xfce-utils-4.4.3-xfterm4-bug.patch
 # modfied version of http://bugzilla.xfce.org/show_bug.cgi?id=3770
 Patch2:         xfce-utils-4.7.1-test-running-screensver.patch
 Patch3:         xfce-utils-4.8.0-fix-desktop-categories.patch
+# Already upstream: http://git.xfce.org/xfce/xfce-utils/commit/?id=9b6d7d17b466d605e6cd3febd7291cc0f38c0336
+# Prevents gnome from running the 4.6 migration on gnome login. 
+Patch4:		xfce-utils-4.8.3-46-migration-gnome.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
@@ -48,6 +51,7 @@ This package includes common docs for the Xfce Desktop Environment.
 %patch1 -p1 -b .xfterm4-bug
 %patch2 -p1 -b .gnome-screensaver
 %patch3 -p1 -b .desktop-categories
+%patch4 -p1 -b .46-migration-gnome
 
 
 %build
@@ -130,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_docdir}/%{name}/
 
 %changelog
+* Fri Dec 09 2011 Kevin Fenzi <kevin at scrye.com> - 4.8.3-2
+- Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621
+
 * Fri Sep 23 2011 Kevin Fenzi <kevin at scrye.com> - 4.8.3-1
 - Update to 4.8.3