From c923d3fa8905b5e39ccb9f199ad4b10da1193316 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Nov 07 2013 04:44:27 +0000
Subject: Fix patch fuzz


---

diff --git a/0001-Improve-auto-detection.patch b/0001-Improve-auto-detection.patch
deleted file mode 100644
index d810914..0000000
--- a/0001-Improve-auto-detection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b21b4ce0bc3962510bd79361160ee629b161f4fd Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Wed, 9 Oct 2013 10:55:09 -0400
-Subject: [PATCH] Improve auto detection.
-
-If the user has an explicitly set KRB5CCNAME, assume he is using kerberos
-even if the ccache is still empty.
----
- src/ka-applet.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/ka-applet.c b/src/ka-applet.c
-index 2b48825d2a5bf8c47c713ba6d59a9865a10b6fd8..025318896c04885f690281716f366570b71ede1b 100644
---- a/src/ka-applet.c
-+++ b/src/ka-applet.c
-@@ -132,7 +132,8 @@ ka_applet_command_line (GApplication            *application,
-     KA_DEBUG ("Evaluating command line");
- 
-     if (!self->priv->startup_ccache &&
--        self->priv->auto_run)
-+        self->priv->auto_run &&
-+        !getenv("KRB5CCNAME"))
-         ka_applet_destroy (self);
-     else
-         ka_applet_activate (application);
--- 
-1.8.3.1
-
diff --git a/Improve-auto-detection.patch b/Improve-auto-detection.patch
new file mode 100644
index 0000000..e9bdaa5
--- /dev/null
+++ b/Improve-auto-detection.patch
@@ -0,0 +1,13 @@
+diff -uPr krb5-auth-dialog-3.2.1.orig/src/ka-applet.c krb5-auth-dialog-3.2.1.new/src/ka-applet.c
+--- krb5-auth-dialog-3.2.1.orig/src/ka-applet.c	2013-11-06 23:42:05.779367752 -0500
++++ krb5-auth-dialog-3.2.1.new/src/ka-applet.c	2013-11-06 23:42:36.642567362 -0500
+@@ -129,7 +129,8 @@
+     KA_DEBUG ("Evaluating command line");
+     
+     if (!self->priv->startup_ccache &&
+-        self->priv->auto_run)
++        self->priv->auto_run &&
++        !getenv("KRB5CCNAME"))
+         ka_applet_destroy (self);
+     else
+         ka_applet_activate (application);
diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec
index c26539f..1cb8132 100644
--- a/krb5-auth-dialog.spec
+++ b/krb5-auth-dialog.spec
@@ -9,7 +9,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.t
 
 # avoid annoying notifications
 Patch0: krb5-auth-dialog-autostart.patch
-Patch1: 0001-Improve-auto-detection.patch
+Patch1: Improve-auto-detection.patch
 
 BuildRequires: krb5-devel
 BuildRequires: perl(XML::Parser), gettext