Hello community, here is the log from the commit of package seahorse checked in at Thu Sep 20 01:48:25 CEST 2007. -------- --- GNOME/seahorse/seahorse.changes 2007-09-05 22:34:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/seahorse/seahorse.changes 2007-09-19 18:09:30.945654000 +0200 @@ -1,0 +2,38 @@ +Wed Sep 19 18:08:48 CEST 2007 - maw@suse.de + +- Respin abuild.patch based on feedback from a seahorse maintainer + (thanks, Adam) +- Run %suse_update_desktop_file against more .desktop files. + +------------------------------------------------------------------- +Tue Sep 18 19:14:34 CEST 2007 - maw@suse.de + +- Update to version 2.20.0: + + The large version bump is due to the seahorse project + synchronizing its version numbers with those of much of the + rest of the GNOME project + + Hide the agent tray icon by default + + Can now change gnome keyring master password + + Added option to disable auto-retrieval of keys from key + servers + + Give more detail for imported keys + + Display gnome-keyring items properly + + Progress windows show up in the window list now + + Wrap text in the encryption applet properly + + Now builds with GPG 2.0 + + Can now select archive extensions properly when encrypting + files + + Fix problem with internationalized expiration dates on PGP + keys + + Select a proper key size for SSH DSA keys + + Allow SSH keys to be uploaded to machines listening on + non-standard ports + + Can now import SSH keys that were generated elsewhere + + Dialog and HIG fixes + + Fix build problems + + Fix crashers and problematic assertions + + Updated translations +- Respin abuild.patch +- Remove seahorse-gpg-version.patch, which has been upstreamed. + +------------------------------------------------------------------- Old: ---- seahorse-1.0.1.tar.bz2 seahorse-gpg-version.patch New: ---- seahorse-2.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seahorse.spec ++++++ --- /var/tmp/diff_new_pack.E29464/_old 2007-09-20 01:47:41.000000000 +0200 +++ /var/tmp/diff_new_pack.E29464/_new 2007-09-20 01:47:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package seahorse (Version 1.0.1) +# spec file for package seahorse (Version 2.20) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,23 +11,21 @@ # norootforbuild Name: seahorse -BuildRequires: fdupes gnome-doc-utils-devel gnome-themes gpg2 gpgme-devel intltool libglade2-devel libgnomeprintui-devel libgpg-error-devel libsoup-devel libwnck-devel mDNSResponder-devel nautilus-devel openldap2 openldap2-devel openssh perl-XML-Parser update-desktop-files +BuildRequires: fdupes gnome-doc-utils-devel gnome-themes gnome-vfs2-devel gpg2 gpgme-devel intltool libglade2-devel libgnomeprintui-devel libgpg-error-devel libsoup-devel libwnck-devel mDNSResponder-devel nautilus-devel openldap2 openldap2-devel openssh perl-XML-Parser update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Autoreqprov: on +AutoReqProv: on PreReq: gconf2 -Version: 1.0.1 -Release: 56 +Version: 2.20 +Release: 1 Requires: %{name}-lang = %{version} Summary: GNOME2 interface for gnupg Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 Patch2: %{name}-gpgme-version.patch Patch3: abuild.patch -Patch4: %{name}-gpg-version.patch Patch5: seahorse-desktop.patch -URL: http://seahorse.sourceforge.net/ +Url: http://seahorse.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build - %gconf_schemas_prereq %description @@ -67,7 +65,6 @@ %setup %patch2 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %build @@ -91,6 +88,9 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %suse_update_desktop_file %{name} Security -G "Passwords and Encryption Keys" -N "Seahorse" %suse_update_desktop_file %{name}-pgp-preferences Security +%suse_update_desktop_file %{name}-pgp-signature Security +%suse_update_desktop_file %{name}-pgp-keys Security +%suse_update_desktop_file %{name}-pgp-encrypted Security # Hack to work around check for installed icons in .desktop files mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps cp %{_prefix}/share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-keys.png \ @@ -99,11 +99,9 @@ %find_lang %{name} %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst - %fdupes $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre - %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -133,7 +131,6 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so %{_libdir}/seahorse/* %{_datadir}/applications/*.desktop -%{_datadir}/control-center-2.0 %{_datadir}/dbus-1/services/org.gnome.seahorse.service %{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/icons/hicolor/*/apps/*.png @@ -158,8 +155,39 @@ %{_libdir}/pkgconfig/*.pc %dir %{_includedir}/libcryptui %{_includedir}/libcryptui/*.h - %changelog +* Wed Sep 19 2007 - maw@suse.de +- Respin abuild.patch based on feedback from a seahorse maintainer + (thanks, Adam) +- Run %%suse_update_desktop_file against more .desktop files. +* Tue Sep 18 2007 - maw@suse.de +- Update to version 2.20.0: + + The large version bump is due to the seahorse project + synchronizing its version numbers with those of much of the + rest of the GNOME project + + Hide the agent tray icon by default + + Can now change gnome keyring master password + + Added option to disable auto-retrieval of keys from key + servers + + Give more detail for imported keys + + Display gnome-keyring items properly + + Progress windows show up in the window list now + + Wrap text in the encryption applet properly + + Now builds with GPG 2.0 + + Can now select archive extensions properly when encrypting + files + + Fix problem with internationalized expiration dates on PGP + keys + + Select a proper key size for SSH DSA keys + + Allow SSH keys to be uploaded to machines listening on + non-standard ports + + Can now import SSH keys that were generated elsewhere + + Dialog and HIG fixes + + Fix build problems + + Fix crashers and problematic assertions + + Updated translations +- Respin abuild.patch +- Remove seahorse-gpg-version.patch, which has been upstreamed. * Wed Sep 05 2007 - maw@suse.de - Correct a .desktop file (#272535). * Tue Aug 07 2007 - maw@suse.de ++++++ abuild.patch ++++++ --- /var/tmp/diff_new_pack.E29464/_old 2007-09-20 01:47:41.000000000 +0200 +++ /var/tmp/diff_new_pack.E29464/_new 2007-09-20 01:47:41.000000000 +0200 @@ -1,24 +1,34 @@ -Index: seahorse-1.0.1/plugins/nautilus/seahorse-tool-files.c +Index: seahorse-2.20/plugins/nautilus/seahorse-tool-files.c =================================================================== ---- seahorse-1.0.1.orig/plugins/nautilus/seahorse-tool-files.c -+++ seahorse-1.0.1/plugins/nautilus/seahorse-tool-files.c +--- seahorse-2.20.orig/plugins/nautilus/seahorse-tool-files.c ++++ seahorse-2.20/plugins/nautilus/seahorse-tool-files.c @@ -23,8 +23,10 @@ #include <sys/types.h> #include <sys/wait.h> #include <stdlib.h> -+#include <string.h> - #include <libintl.h> +-#include <libintl.h> ++#include <string.h> ++#include <libintl.h> -+#include <glib.h> ++#include <glib.h> #include <gnome.h> #include <libgnomevfs/gnome-vfs.h> -@@ -236,9 +238,11 @@ prepare_dialog (FilesCtx *ctx, guint nfo - pkg = seahorse_util_uri_split_last (pkguri); - gtk_entry_set_text (GTK_ENTRY (w), pkg); +@@ -366,7 +368,7 @@ prepare_dialog (FilesCtx *ctx, guint nfo + GtkWidget *combo; + gchar *msg; + gboolean sep; +- gint sel, i; ++ gint i; + GtkCellRenderer *cell; + GtkTreeModel *store; + FRFileType *save_type_list; +@@ -428,9 +430,11 @@ prepare_dialog (FilesCtx *ctx, guint nfo + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i); + } - if(sep) { -+ if (sep) { ++ if (!sep) { gtk_widget_grab_focus (w); - gtk_editable_select_region (GTK_EDITABLE (w), 0, sel); + /* Is this TRT? */ @@ -27,41 +37,58 @@ } /* Setup the main radio buttons */ -Index: seahorse-1.0.1/libseahorse/seahorse-ssh-operation.c +Index: seahorse-2.20/libseahorse/seahorse-ssh-operation.c =================================================================== ---- seahorse-1.0.1.orig/libseahorse/seahorse-ssh-operation.c -+++ seahorse-1.0.1/libseahorse/seahorse-ssh-operation.c -@@ -994,7 +994,10 @@ set_keyring_passphrase (SeahorseKey *ske +--- seahorse-2.20.orig/libseahorse/seahorse-ssh-operation.c ++++ seahorse-2.20/libseahorse/seahorse-ssh-operation.c +@@ -994,8 +994,11 @@ set_keyring_passphrase (SeahorseKey *ske const gchar *id; gchar *display; - g_assert (id != NULL); -+ /* Uhh? */ -+ /* g_assert (id != NULL); */ + g_assert ((skey != NULL) && (pass != NULL)); + id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey)); ++ g_assert (id != NULL); ++ display = seahorse_key_get_display_name (skey); -Index: seahorse-1.0.1/src/seahorse-pgp-generate.c + attributes = gnome_keyring_attribute_list_new (); +Index: seahorse-2.20/src/seahorse-pgp-generate.c =================================================================== ---- seahorse-1.0.1.orig/src/seahorse-pgp-generate.c -+++ seahorse-1.0.1/src/seahorse-pgp-generate.c -@@ -65,7 +65,8 @@ on_response (GtkDialog *dialog, guint re +--- seahorse-2.20.orig/src/seahorse-pgp-generate.c ++++ seahorse-2.20/src/seahorse-pgp-generate.c +@@ -65,7 +65,6 @@ on_response (GtkDialog *dialog, guint re const gchar *email; const gchar *comment; const gchar *pass; - const gchar *t; -+ /* got to call it something, i guess. */ -+ const gchar *t = "gpg/pgp"; gpgme_error_t gerr; gint sel; guint type; -Index: seahorse-1.0.1/libseahorse/seahorse-default-key-control.c +@@ -114,7 +113,7 @@ on_response (GtkDialog *dialog, guint re + g_return_if_fail (widget != NULL); + bits = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); + if (bits < 512 || bits > 8192) { +- g_message ("invalid key size: %s defaulting to 2048", t); ++ g_message ("invalid key size: %s defaulting to 2048", available_algorithms[sel].desc); + bits = 2048; + } + +Index: seahorse-2.20/libseahorse/seahorse-combo-keys.c =================================================================== ---- seahorse-1.0.1.orig/libseahorse/seahorse-default-key-control.c -+++ seahorse-1.0.1/libseahorse/seahorse-default-key-control.c -@@ -78,7 +78,7 @@ key_changed (SeahorseKeyset *skset, Seah +--- seahorse-2.20.orig/libseahorse/seahorse-combo-keys.c ++++ seahorse-2.20/libseahorse/seahorse-combo-keys.c +@@ -68,7 +68,7 @@ key_changed (SeahorseKeyset *skset, Seah + gchar *userid; + gpointer pntr; + SeahorseKey *skeyfrommodel; +- ++ + g_return_if_fail (skey != NULL); + + model = gtk_combo_box_get_model (combo); +@@ -76,7 +76,7 @@ key_changed (SeahorseKeyset *skset, Seah while (valid) { gtk_tree_model_get (model, &iter, @@ -70,11 +97,18 @@ -1); skeyfrommodel = SEAHORSE_KEY (pntr); -@@ -111,10 +111,11 @@ key_removed (SeahorseKeyset *skset, Seah +@@ -104,15 +104,17 @@ key_removed (SeahorseKeyset *skset, Seah + gpointer pntr; + gboolean valid; + SeahorseKey *skeyfrommodel; +- ++ + g_return_if_fail (skey != NULL); g_return_if_fail (combo != NULL); - model = gtk_combo_box_get_model (combo); + valid = gtk_tree_model_get_iter_first (model, &iter); ++ + model = gtk_combo_box_get_model (combo); while (valid) { gtk_tree_model_get (model, &iter, @@ -83,3 +117,24 @@ -1); skeyfrommodel = SEAHORSE_KEY (pntr); +Index: seahorse-2.20/plugins/nautilus/seahorse-tool-progress.c +=================================================================== +--- seahorse-2.20.orig/plugins/nautilus/seahorse-tool-progress.c ++++ seahorse-2.20/plugins/nautilus/seahorse-tool-progress.c +@@ -24,6 +24,7 @@ + #include <signal.h> + + #include <gnome.h> ++#include <libgnomevfs/gnome-vfs.h> + + #include "seahorse-gtkstock.h" + #include "seahorse-util.h" +@@ -274,7 +275,7 @@ seahorse_tool_progress_update (gdouble f + gchar *msg; + + if (message != NULL) +- msg = gnome_vfs_unescape_string (message); ++ msg = gnome_vfs_unescape_string (message, NULL); + else + msg = g_strdup (""); + ++++++ seahorse-1.0.1.tar.bz2 -> seahorse-2.20.tar.bz2 ++++++ ++++ 170223 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org