From 33c738c9b4f3448a2c7b0543c0725d0988c74da7f257fc0722a69dc8be6256d8 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 11 Feb 2010 00:31:50 +0000
Subject: [PATCH] Accepting request 32112 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/seahorse via accept of submit request 32112 revision 4.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/32112
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=75
---
 seahorse-2.29.4.tar.bz2         |  3 ---
 seahorse-2.29.90.tar.bz2        |  3 +++
 seahorse-missing-sentinel.patch | 13 -------------
 seahorse.changes                | 13 +++++++++++++
 seahorse.spec                   |  9 ++-------
 5 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 seahorse-2.29.4.tar.bz2
 create mode 100644 seahorse-2.29.90.tar.bz2
 delete mode 100644 seahorse-missing-sentinel.patch

diff --git a/seahorse-2.29.4.tar.bz2 b/seahorse-2.29.4.tar.bz2
deleted file mode 100644
index e942a77..0000000
--- a/seahorse-2.29.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:760bbd0606e9fee0847440290d1552e2f200c9ab83197a8d22e8b06a25b64f9c
-size 2396936
diff --git a/seahorse-2.29.90.tar.bz2 b/seahorse-2.29.90.tar.bz2
new file mode 100644
index 0000000..69bc3b4
--- /dev/null
+++ b/seahorse-2.29.90.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:470ddaf6e6a4f0747640f99ba6bfe72983ea3bee39c1c46f51d06091a7e3ef43
+size 2401819
diff --git a/seahorse-missing-sentinel.patch b/seahorse-missing-sentinel.patch
deleted file mode 100644
index 800483b..0000000
--- a/seahorse-missing-sentinel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-2.29.4/pgp/seahorse-gpg-options.c
-===================================================================
---- seahorse-2.29.4.orig/pgp/seahorse-gpg-options.c
-+++ seahorse-2.29.4/pgp/seahorse-gpg-options.c
-@@ -215,7 +215,7 @@ parse_home_directory (gpgme_engine_info_
- 
-                     /* If it's not a rooted path then expand */
-                     if (t[0] == '~') {
--                        gpg_homedir = g_strconcat (g_get_home_dir(), ++t);
-+                        gpg_homedir = g_strconcat (g_get_home_dir(), ++t, NULL);
-                     } else {
-                         gpg_homedir = g_strdup (t);
-                     }
diff --git a/seahorse.changes b/seahorse.changes
index c54a8aa..ff1049b 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Feb 11 00:04:45 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.29.90:
+  + pgp: Make subkey creation more robust
+  + Drop daemon autostart file
+  + Update eggdesktopfile.[ch] from libegg/smclient
+  + Various fixes
+  + Updated translations.
+- Drop seahorse-missing-sentinel.patch: fixed upstream.
+- Do not call suse_update_desktop_file on seahorse-daemon: it got
+  removed.
+
 -------------------------------------------------------------------
 Thu Dec 24 15:29:57 CET 2009 - vuntz@opensuse.org
 
diff --git a/seahorse.spec b/seahorse.spec
index 1c472cd..f3aee69 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package seahorse (Version 2.29.4)
+# spec file for package seahorse (Version 2.29.90)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -39,15 +39,13 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 License:        GPLv2+
 Group:          Productivity/Security
-Version:        2.29.4
+Version:        2.29.90
 Release:        1
 Requires:       %{name}-lang = %{version}
 Summary:        GNOME2 interface for gnupg
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE seahorse-xsltproc-nonet.patch
 Patch1:         seahorse-xsltproc-nonet.patch
-# PATCH-FIX-UPSTREAM seahorse-missing-sentinel.patch bgo#605367 vuntz@opensuse.org -- Fix build
-Patch2:         seahorse-missing-sentinel.patch
 Url:            http://seahorse.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
@@ -70,7 +68,6 @@ Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend.
 %setup
 translation-update-upstream
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure \
@@ -85,7 +82,6 @@ make %{?jobs:-j%jobs}
 %endif
 %{__rm} -f %{buildroot}%{_libdir}/*.*a
 %suse_update_desktop_file %{name} -G "Passwords and Encryption Keys" -N "Seahorse"
-%suse_update_desktop_file seahorse-daemon
 %find_lang %{name}
 %find_gconf_schemas
 cat %{name}.schemas_list >%{name}.lst
@@ -125,7 +121,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/pixmaps/seahorse
 %{_datadir}/seahorse
-%{_sysconfdir}/xdg/autostart/*.desktop
 
 %files lang -f %{name}.lang
 # Temporary workaround to not depend on libgnome: own the directories