From 77414ada93e076b5a89aaecca5b9db0f109ce601 Mon Sep 17 00:00:00 2001
From: Seth Vidal <skvidal@fedoraproject.org>
Date: Jan 08 2008 03:33:32 +0000
Subject: add seahorse-agent xinit script


---

diff --git a/seahorse-agent.sh b/seahorse-agent.sh
new file mode 100644
index 0000000..75cf808
--- /dev/null
+++ b/seahorse-agent.sh
@@ -0,0 +1,4 @@
+!/bin/sh
+if [ -x /usr/bin/seahorse-agent ]; then
+    export `/usr/bin/seahorse-agent --variables`
+fi
diff --git a/seahorse.spec b/seahorse.spec
index 806dd1d..45d8d0c 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,6 +1,6 @@
 Name: 		seahorse
 Version: 	2.21.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	GNOME2 interface for gnupg
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -8,6 +8,7 @@ Group: 		User Interface/Desktops
 License:        GPLv2+ and LGPLv2+
 URL:            http://seahorse.sourceforge.net/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.21/%{name}-%{version}.tar.gz
+Source1:	seahorse-agent.sh
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -59,6 +60,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
+mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/seahorse-agent.sh
+
+
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 %find_lang seahorse
 
@@ -136,6 +141,7 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
+%{_sysconfdir}/X11/xinit/xinitrc.d/seahorse-agent.sh
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/*.desktop
@@ -162,6 +168,11 @@ fi
 
 
 %changelog
+* Mon Jan  7 2008 Seth Vidal <skvidal at fedoraproject.org> 2.21.4-2
+- drop in seahorse-agent.sh to xinit - closes bug 427466 but will mean
+  that seahorse agent will start if it is installed - even on kde or xfce
+  desktops :(
+
 * Thu Jan  3 2008 Seth Vidal <skvidal at fedoraproject.org> 2.21.4-1
 - upgrade to 2.21.4