rpms/seahorse/devel seahorse-2.25.3-pkcs11-slot.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 seahorse.spec, 1.56, 1.57 sources, 1.23, 1.24

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13179

Modified Files:
	.cvsignore seahorse.spec sources 
Added Files:
	seahorse-2.25.3-pkcs11-slot.patch 
Log Message:
* Mon Dec 22 2008 Tomas Bzatek <tbzatek at redhat.com> 2.25.3-1
- Update to 2.25.3


seahorse-2.25.3-pkcs11-slot.patch:

--- NEW FILE seahorse-2.25.3-pkcs11-slot.patch ---
--- 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);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Nov 2008 06:41:11 -0000	1.21
+++ .cvsignore	22 Dec 2008 13:19:57 -0000	1.22
@@ -1 +1 @@
-seahorse-2.25.1.tar.bz2
+seahorse-2.25.3.tar.bz2


Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- seahorse.spec	3 Dec 2008 02:16:48 -0000	1.56
+++ seahorse.spec	22 Dec 2008 13:19:58 -0000	1.57
@@ -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 @@
 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:  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 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gpg2
+%patch1 -p1 -b .pcks11-slot
 
 %build
 %configure --disable-scrollkeeper
@@ -149,6 +155,8 @@
 %{_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 @@
 %{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
+* Mon Dec 22 2008 Tomas Bzatek <tbzatek at redhat.com> 2.25.3-1
+- Update to 2.25.3
+
 * Tue Dec  2 2008 Matthias Clasen <mclasen at redhat.com> 2.25.1-3
 - Rebuild for pkg-config provides
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Nov 2008 06:41:11 -0000	1.23
+++ sources	22 Dec 2008 13:19:58 -0000	1.24
@@ -1 +1 @@
-a2cad0b5ee514f54bd98d822701d3d7d  seahorse-2.25.1.tar.bz2
+914a8eb10695ae26d02d2a63698ab956  seahorse-2.25.3.tar.bz2