gnome-keyring: Fix GNOME Bug #610715

Configures gnome-keyring to start for all DEs, not just GNOME or LXDE
PATCHLEVEL++
(cherry picked from commit 9480b8fc9fae30484da65b0f604c06ee7cb67781)

4 files changed, 77 insertions, 0 deletions

diff --git a/gnome2-libs/gnome-keyring/DETAILS b/gnome2-libs/gnome-keyring/DETAILS
index 4731d2762d..9f0cacb3ec 100755
--- a/gnome2-libs/gnome-keyring/DETAILS
+++ b/gnome2-libs/gnome-keyring/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=LGPL
+      PATCHLEVEL=1
         WEB_SITE=http://live.gnome.org/GnomeKeyring
          ENTERED=20020505
         KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/gnome-keyring/HISTORY b/gnome2-libs/gnome-keyring/HISTORY
index da0b4747fa..acd03ee8da 100644
--- a/gnome2-libs/gnome-keyring/HISTORY
+++ b/gnome2-libs/gnome-keyring/HISTORY
@@ -1,3 +1,9 @@
+2010-05-06 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Apply bug610715.patch
+	* bug610715.patch: Fix GNOME Bug #610715
+	  Configures gnome-keyring to start for all DEs, not just GNOME or LXDE
+
 2010-05-03 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.30.1
 
diff --git a/gnome2-libs/gnome-keyring/PRE_BUILD b/gnome2-libs/gnome-keyring/PRE_BUILD
new file mode 100755
index 0000000000..6e35c28e25
--- /dev/null
+++ b/gnome2-libs/gnome-keyring/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+message "${MESSAGE_COLOR}Apply patch for GNOME Bug #610715...${DEFAULT_COLOR}" &&
+patch -p1 < $SPELL_DIRECTORY/bug610715.patch
diff --git a/gnome2-libs/gnome-keyring/bug610715.patch b/gnome2-libs/gnome-keyring/bug610715.patch
new file mode 100644
index 0000000000..c09fffc57e
--- /dev/null
+++ b/gnome2-libs/gnome-keyring/bug610715.patch
@@ -0,0 +1,66 @@
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:32:08.503107570 -0700
+@@ -3,7 +3,6 @@
+ _Name=Certificate and Key Storage
+ _Comment=GNOME Keyring: PKCS#11 Component
+ Exec= gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:32:10.361857745 -0700
+@@ -3,7 +3,6 @@
+ _Name=Certificate and Key Storage
+ _Comment=GNOME Keyring: PKCS#11 Component
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:52.119857815 -0700
+@@ -3,7 +3,6 @@
+ _Name=Secret Storage Service
+ _Comment=GNOME Keyring: Secret Service
+ Exec= gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:48.458857814 -0700
+@@ -3,7 +3,6 @@
+ _Name=Secret Storage Service
+ _Comment=GNOME Keyring: Secret Service
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:32:14.603857675 -0700
+@@ -3,7 +3,6 @@
+ _Name=SSH Key Agent
+ _Comment=GNOME Keyring: SSH Agent
+ Exec= gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:27:39.790857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:32:16.422857745 -0700
+@@ -3,7 +3,6 @@
+ _Name=SSH Key Agent
+ _Comment=GNOME Keyring: SSH Agent
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false