pool/seahorse
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seahorse?expand=0&rev=10

Browse Source
This commit is contained in:
OBS User unknown 2007-09-19 23:48:26 +00:00 committed by Git OBS Bridge
parent df78a1f5bd
commit da0f6b2f30
6 changed files with 174 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
abuild.patch
View File

@ -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-2.20.orig/plugins/nautilus/seahorse-tool-files.c
+++ seahorse-1.0.1/plugins/nautilus/seahorse-tool-files.c +++ seahorse-2.20/plugins/nautilus/seahorse-tool-files.c
@@ -23,8 +23,10 @@ @@ -23,8 +23,10 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <stdlib.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 <gnome.h>
#include <libgnomevfs/gnome-vfs.h> #include <libgnomevfs/gnome-vfs.h>
@@ -236,9 +238,11 @@ prepare_dialog (FilesCtx *ctx, guint nfo @@ -366,7 +368,7 @@ prepare_dialog (FilesCtx *ctx, guint nfo
pkg = seahorse_util_uri_split_last (pkguri); GtkWidget *combo;
gtk_entry_set_text (GTK_ENTRY (w), pkg); 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) { + if (!sep) {
gtk_widget_grab_focus (w); gtk_widget_grab_focus (w);
- gtk_editable_select_region (GTK_EDITABLE (w), 0, sel); - gtk_editable_select_region (GTK_EDITABLE (w), 0, sel);
+ /* Is this TRT? */ + /* Is this TRT? */
@ -27,54 +37,58 @@ Index: seahorse-1.0.1/plugins/nautilus/seahorse-tool-files.c
} }
/* Setup the main radio buttons */ /* 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-2.20.orig/libseahorse/seahorse-ssh-operation.c
+++ seahorse-1.0.1/libseahorse/seahorse-ssh-operation.c +++ seahorse-2.20/libseahorse/seahorse-ssh-operation.c
@@ -994,7 +994,10 @@ set_keyring_passphrase (SeahorseKey *ske @@ -994,8 +994,11 @@ set_keyring_passphrase (SeahorseKey *ske
const gchar *id; const gchar *id;
gchar *display; gchar *display;
- g_assert (id != NULL); - g_assert (id != NULL);
+ /* Uhh? */
+ /* g_assert (id != NULL); */
+ g_assert ((skey != NULL) && (pass != NULL)); + g_assert ((skey != NULL) && (pass != NULL));
+ +
id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey)); id = seahorse_key_get_rawid (seahorse_key_get_keyid (skey));
+ g_assert (id != NULL);
+
display = seahorse_key_get_display_name (skey); 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-2.20.orig/src/seahorse-pgp-generate.c
+++ seahorse-1.0.1/src/seahorse-pgp-generate.c +++ seahorse-2.20/src/seahorse-pgp-generate.c
@@ -65,7 +65,8 @@ on_response (GtkDialog *dialog, guint re @@ -65,7 +65,6 @@ on_response (GtkDialog *dialog, guint re
const gchar *email; const gchar *email;
const gchar *comment; const gchar *comment;
const gchar *pass; const gchar *pass;
- const gchar *t; - const gchar *t;
+ /* got to call it something, i guess. */
+ const gchar *t = "gpg/pgp";
gpgme_error_t gerr; gpgme_error_t gerr;
gint sel; gint sel;
guint type; 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);
--- seahorse-1.0.1.orig/libseahorse/seahorse-default-key-control.c bits = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
+++ seahorse-1.0.1/libseahorse/seahorse-default-key-control.c if (bits < 512 || bits > 8192) {
@@ -78,7 +78,7 @@ key_changed (SeahorseKeyset *skset, Seah - 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;
}
while (valid) { Index: seahorse-2.20/libseahorse/seahorse-combo-keys.c
gtk_tree_model_get (model, &iter, ===================================================================
- COMBO_POINTER, pntr, --- seahorse-2.20.orig/libseahorse/seahorse-combo-keys.c
+ COMBO_POINTER, &pntr, +++ seahorse-2.20/libseahorse/seahorse-combo-keys.c
-1); @@ -68,7 +68,7 @@ key_changed (SeahorseKeyset *skset, Seah
gchar *userid;
skeyfrommodel = SEAHORSE_KEY (pntr); gpointer pntr;
@@ -111,10 +111,11 @@ key_removed (SeahorseKeyset *skset, Seah SeahorseKey *skeyfrommodel;
g_return_if_fail (combo != NULL); -
+
g_return_if_fail (skey != NULL);
model = gtk_combo_box_get_model (combo); model = gtk_combo_box_get_model (combo);
+ valid = gtk_tree_model_get_iter_first (model, &iter); @@ -76,7 +76,7 @@ key_changed (SeahorseKeyset *skset, Seah
while (valid) { while (valid) {
gtk_tree_model_get (model, &iter, gtk_tree_model_get (model, &iter,
@ -83,3 +97,44 @@ Index: seahorse-1.0.1/libseahorse/seahorse-default-key-control.c
-1); -1);
skeyfrommodel = SEAHORSE_KEY (pntr); skeyfrommodel = SEAHORSE_KEY (pntr);
@@ -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);
+ valid = gtk_tree_model_get_iter_first (model, &iter);
+
model = gtk_combo_box_get_model (combo);
while (valid) {
gtk_tree_model_get (model, &iter,
- COMBO_POINTER, pntr,
+ COMBO_POINTER, &pntr,
-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 ("");

3
seahorse-1.0.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eff8cc7e14d2d2e18d3ddcc1e532378a6469911649977197751fe0c6643d1741
size 1857599

3
seahorse-2.20.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5216a1d9a6592b4fe253fb85236f862cd34f4b0d04ab70c23288a7e4b100548b
size 2055434

18
seahorse-gpg-version.patch
View File

@ -1,18 +0,0 @@
gpg 1.x has been dropped; see
http://lists.opensuse.org/opensuse-factory/2007-06/msg00142.html
Index: seahorse-1.0.1/configure.in
===================================================================
--- seahorse-1.0.1.orig/configure.in
+++ seahorse-1.0.1/configure.in
@@ -83,8 +83,8 @@ AC_ARG_ENABLE(gpg-check,
DO_CHECK=$enableval, DO_CHECK=yes)
if test "$DO_CHECK" = "yes"; then
- accepted_versions="1.2 1.4"
- AC_PATH_PROG(GNUPG, gpg, no)
+ accepted_versions="1.2 1.4 2.0"
+ AC_PATH_PROG(GNUPG, gpg2, no)
ok="no"
if test "$GNUPG" != "no"; then
AC_MSG_CHECKING(for appropriate GnuPG version)

38
seahorse.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
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.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 5 22:34:21 CEST 2007 - maw@suse.de Wed Sep 5 22:34:21 CEST 2007 - maw@suse.de

54
seahorse.spec
View File

@ -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. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -11,23 +11,21 @@
# norootforbuild # norootforbuild
Name: seahorse 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 License: GPL v2 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Autoreqprov: on AutoReqProv: on
PreReq: gconf2 PreReq: gconf2
Version: 1.0.1 Version: 2.20
Release: 56 Release: 1
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
Summary: GNOME2 interface for gnupg Summary: GNOME2 interface for gnupg
Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
Patch2: %{name}-gpgme-version.patch Patch2: %{name}-gpgme-version.patch
Patch3: abuild.patch Patch3: abuild.patch
Patch4: %{name}-gpg-version.patch
Patch5: seahorse-desktop.patch Patch5: seahorse-desktop.patch
URL: http://seahorse.sourceforge.net/ Url: http://seahorse.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq %gconf_schemas_prereq
%description %description
@ -67,7 +65,6 @@ Authors:
%setup %setup
%patch2 %patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1 %patch5 -p1
%build %build
@ -91,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
%suse_update_desktop_file %{name} Security -G "Passwords and Encryption Keys" -N "Seahorse" %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-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 # Hack to work around check for installed icons in .desktop files
mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps
cp %{_prefix}/share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-keys.png \ cp %{_prefix}/share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-keys.png \
@ -99,11 +99,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.*a
%find_lang %{name} %find_lang %{name}
%find_gconf_schemas %find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst cat %{name}.schemas_list >%{name}.lst
%fdupes $RPM_BUILD_ROOT %fdupes $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre %pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans %posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun %preun -f %{name}.schemas_preun
@ -133,7 +131,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so %{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so
%{_libdir}/seahorse/* %{_libdir}/seahorse/*
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/control-center-2.0
%{_datadir}/dbus-1/services/org.gnome.seahorse.service %{_datadir}/dbus-1/services/org.gnome.seahorse.service
%{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/icons/hicolor/*/apps/*.svg
%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.png
@ -158,8 +155,39 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%dir %{_includedir}/libcryptui %dir %{_includedir}/libcryptui
%{_includedir}/libcryptui/*.h %{_includedir}/libcryptui/*.h
%changelog %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 * Wed Sep 05 2007 - maw@suse.de
- Correct a .desktop file (#272535). - Correct a .desktop file (#272535).
* Tue Aug 07 2007 - maw@suse.de * Tue Aug 07 2007 - maw@suse.de