From 3ee5b58581a0d353d683c07751095e09ccd2f14c30bb15887a47f449270ae218 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 24 Dec 2009 15:26:55 +0000 Subject: [PATCH] Accepting request 27610 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/seahorse via accept of submit request 27610 revision 8. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27610 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=73 --- seahorse-2.28.0.tar.bz2 | 3 -- seahorse-2.29.4.tar.bz2 | 3 ++ seahorse-missing-sentinel.patch | 13 +++++++++ seahorse.changes | 52 +++++++++++++++++++++++++++++++++ seahorse.spec | 22 ++++++++++---- 5 files changed, 84 insertions(+), 9 deletions(-) delete mode 100644 seahorse-2.28.0.tar.bz2 create mode 100644 seahorse-2.29.4.tar.bz2 create mode 100644 seahorse-missing-sentinel.patch diff --git a/seahorse-2.28.0.tar.bz2 b/seahorse-2.28.0.tar.bz2 deleted file mode 100644 index 615997e..0000000 --- a/seahorse-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63d40fea2b8fb52d1b29d10bee2c5c3a6722516a770793979eb062ed53588a3e -size 2388622 diff --git a/seahorse-2.29.4.tar.bz2 b/seahorse-2.29.4.tar.bz2 new file mode 100644 index 0000000..e942a77 --- /dev/null +++ b/seahorse-2.29.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:760bbd0606e9fee0847440290d1552e2f200c9ab83197a8d22e8b06a25b64f9c +size 2396936 diff --git a/seahorse-missing-sentinel.patch b/seahorse-missing-sentinel.patch new file mode 100644 index 0000000..800483b --- /dev/null +++ b/seahorse-missing-sentinel.patch @@ -0,0 +1,13 @@ +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 c91d51e..c54a8aa 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Thu Dec 24 15:29:57 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.4: + + Experimental support for introspection of libcryptui + + Full documentation for seahorse-context.c + + Do not use fixed MAXPATHLEN size buffers for portability + + Add seahorse man page + + Fix build with latest gp11 + + Updated translations. +- Add seahorse-missing-sentinel.patch to fix build. + +------------------------------------------------------------------- +Wed Dec 23 10:55:20 CET 2009 - vuntz@opensuse.org + +- Change gnome-keyring-devel BuildRequires to + libgnome-keyring-devel, following the module split upstream. +- Add libgcr-devel and libgp11-devel BuildRequires, that used to + live with gnome-keyring-devel. +- Pass --disable-schemas-install to configure. + +------------------------------------------------------------------- +Wed Dec 2 23:38:43 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.3: + + Set default key length to 2048 bits + + Generate RSA-sign/RSA-encrypt key in one pass + + Support GPG 2.0 + + Fix window signals + + GTK-doc comments + + SSH Key importing fix + + Updated translations. + +------------------------------------------------------------------- +Sat Nov 14 21:52:30 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.1: + + None +- Changes from version 2.28.1: + + Prevent opening help window twice. + + Set bits setting properly when creating SSH key. + + Add support for GnuPG DSA2 keys. + + Fix subkey creation on newer GnuPG versions + + Fix location label in SSH key properties. + + Fix assertion on exit. + + Fix pasting into filter field. + + Set key usage flags properly. + + Fix property bindings. + + Internal documentation. + + Translation fixes. + + Build fixes. + ------------------------------------------------------------------- Tue Sep 22 11:54:12 CEST 2009 - dimstar@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index 4287900..1c472cd 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,5 +1,5 @@ # -# spec file for package seahorse (Version 2.28.0) +# spec file for package seahorse (Version 2.29.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,11 +22,13 @@ Name: seahorse BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel -BuildRequires: gnome-keyring-devel BuildRequires: gpg2 BuildRequires: gpgme-devel BuildRequires: intltool BuildRequires: libavahi-glib-devel +BuildRequires: libgcr-devel +BuildRequires: libgnome-keyring-devel +BuildRequires: libgp11-devel BuildRequires: libgpg-error-devel BuildRequires: libnotify-devel BuildRequires: libsoup-devel @@ -35,15 +37,17 @@ BuildRequires: openldap2-devel BuildRequires: openssh BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Security -Version: 2.28.0 +Version: 2.29.4 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 @@ -52,7 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend. %package devel -License: GPL v2 or later +License: GPLv2+ Summary: GNOME2 interface for gnupg Group: System/GUI/GNOME Requires: %{name} = %{version} @@ -66,13 +70,19 @@ Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend. %setup translation-update-upstream %patch1 -p1 +%patch2 -p1 %build -%configure --disable-scrollkeeper +%configure \ + --disable-scrollkeeper \ + --disable-schemas-install make %{?jobs:-j%jobs} %install %makeinstall +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif %{__rm} -f %{buildroot}%{_libdir}/*.*a %suse_update_desktop_file %{name} -G "Passwords and Encryption Keys" -N "Seahorse" %suse_update_desktop_file seahorse-daemon