From 8be9a2828fae965b9ba91ca433c81004f4b6af57 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@fedoraproject.org>
Date: Mon, 22 Dec 2008 13:19:57 +0000
Subject: [PATCH] * Mon Dec 22 2008 Tomas Bzatek <tbzatek@redhat.com> 2.25.3-1
 - Update to 2.25.3

---
 .cvsignore                        |  2 +-
 seahorse-2.25.3-pkcs11-slot.patch | 11 +++++++++++
 seahorse.spec                     | 17 ++++++++++++++---
 sources                           |  2 +-
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 seahorse-2.25.3-pkcs11-slot.patch

diff --git a/.cvsignore b/.cvsignore
index afbcaca..8dd5243 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-seahorse-2.25.1.tar.bz2
+seahorse-2.25.3.tar.bz2
diff --git a/seahorse-2.25.3-pkcs11-slot.patch b/seahorse-2.25.3-pkcs11-slot.patch
new file mode 100644
index 0000000..19fe4b1
--- /dev/null
+++ b/seahorse-2.25.3-pkcs11-slot.patch
@@ -0,0 +1,11 @@
+--- trunk/pkcs11/seahorse-pkcs11-object.c	2008/12/15 04:19:26	2664
++++ trunk/pkcs11/seahorse-pkcs11-object.c	2008/12/16 03:37:55	2671
+@@ -410,7 +410,7 @@
+ 	/* TODO: This whole ID thing needs rethinking */
+ 	
+ 	text = g_strdup_printf("%s:%lu/%lu", SEAHORSE_PKCS11_TYPE_STR, 
+-                                         gp11_slot_get_handle (object->slot),
++                                         gp11_slot_get_handle (seahorse_pkcs11_source_get_slot (SEAHORSE_PKCS11_SOURCE (seahorse_object_get_source (SEAHORSE_OBJECT (object))))),
+                                          gp11_object_get_handle (object));
+ 	
+ 	quark = g_quark_from_string (text);
diff --git a/seahorse.spec b/seahorse.spec
index 34d9575..1db4bc3 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,6 +1,6 @@
 Name: 		seahorse
-Version: 	2.25.1
-Release:        3%{?dist}
+Version: 	2.25.3
+Release:        1%{?dist}
 Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
@@ -8,9 +8,13 @@ Group: 		User Interface/Desktops
 License:        GPLv2+ and LGPLv2+
 URL:            http://projects.gnome.org/seahorse/
 Source:         http://download.gnome.org/sources/seahorse/2.25/%{name}-%{version}.tar.bz2
-Patch0:         seahorse-2.23.90-gpg2.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         seahorse-2.23.90-gpg2.patch
+
+# Fix compilation by reverting upstream commit 2671
+Patch1:		seahorse-2.25.3-pkcs11-slot.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
@@ -29,6 +33,7 @@ BuildRequires:  gnome-keyring-devel
 BuildRequires:  avahi-devel
 BuildRequires:  avahi-glib-devel
 BuildRequires:	intltool
+BuildRequires:  libtasn1-devel
 Requires(post): desktop-file-utils
 Requires(post): GConf2
 Requires(post): scrollkeeper
@@ -58,6 +63,7 @@ library that belongs to seahorse.
 %prep
 %setup -q
 %patch0 -p1 -b .gpg2
+%patch1 -p1 -b .pcks11-slot
 
 %build
 %configure --disable-scrollkeeper
@@ -149,6 +155,8 @@ fi
 %{_libdir}/libcryptui*.so.*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/dbus-1/services/org.gnome.seahorse.service
+%{_datadir}/cryptui/ui/*
+%{_datadir}/gnome/autostart/*.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -157,6 +165,9 @@ fi
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
+* Mon Dec 22 2008 Tomas Bzatek <tbzatek@redhat.com> 2.25.3-1
+- Update to 2.25.3
+
 * Tue Dec  2 2008 Matthias Clasen <mclasen@redhat.com> 2.25.1-3
 - Rebuild for pkg-config provides
 
diff --git a/sources b/sources
index 7d872dd..167e07f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2cad0b5ee514f54bd98d822701d3d7d  seahorse-2.25.1.tar.bz2
+914a8eb10695ae26d02d2a63698ab956  seahorse-2.25.3.tar.bz2