diff --git a/abuild.patch b/abuild.patch new file mode 100644 index 0000000..96441d0 --- /dev/null +++ b/abuild.patch @@ -0,0 +1,85 @@ +Index: seahorse-1.0.1/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 +@@ -23,8 +23,10 @@ + #include + #include + #include ++#include + #include + ++#include + #include + #include + +@@ -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); + +- if(sep) { ++ if (sep) { + gtk_widget_grab_focus (w); +- gtk_editable_select_region (GTK_EDITABLE (w), 0, sel); ++ /* Is this TRT? */ ++ /* gtk_editable_select_region (GTK_EDITABLE (w), 0, sel); */ ++ gtk_editable_select_region (GTK_EDITABLE (w), 0, strlen (pkg)); + } + + /* Setup the main radio buttons */ +Index: seahorse-1.0.1/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 + 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)); + display = seahorse_key_get_display_name (skey); + +Index: seahorse-1.0.1/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 + 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 +=================================================================== +--- 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 + + while (valid) { + gtk_tree_model_get (model, &iter, +- COMBO_POINTER, pntr, ++ COMBO_POINTER, &pntr, + -1); + + skeyfrommodel = SEAHORSE_KEY (pntr); +@@ -111,10 +111,11 @@ key_removed (SeahorseKeyset *skset, Seah + g_return_if_fail (combo != NULL); + + model = gtk_combo_box_get_model (combo); ++ valid = gtk_tree_model_get_iter_first (model, &iter); + + while (valid) { + gtk_tree_model_get (model, &iter, +- COMBO_POINTER, pntr, ++ COMBO_POINTER, &pntr, + -1); + + skeyfrommodel = SEAHORSE_KEY (pntr); diff --git a/seahorse-0.8.tar.bz2 b/seahorse-0.8.tar.bz2 deleted file mode 100644 index 612be95..0000000 --- a/seahorse-0.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:797a3f22ca135e5def00a872ef9aed07475f753fae76dbddb401011178cd4d17 -size 946453 diff --git a/seahorse-1.0.1.tar.bz2 b/seahorse-1.0.1.tar.bz2 new file mode 100644 index 0000000..c3eddae --- /dev/null +++ b/seahorse-1.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eff8cc7e14d2d2e18d3ddcc1e532378a6469911649977197751fe0c6643d1741 +size 1857599 diff --git a/seahorse-uninited.patch b/seahorse-uninited.patch deleted file mode 100644 index f013e96..0000000 --- a/seahorse-uninited.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libseahorse/seahorse-op.c -+++ libseahorse/seahorse-op.c -@@ -537,7 +537,7 @@ - seahorse_op_verify_file (SeahorseKeySource *sksrc, const gchar *path, const gchar *original, - gpgme_verify_result_t *status, gpgme_error_t *err) - { -- gpgme_data_t sig, plain; -+ gpgme_data_t sig, plain = NULL; - gpgme_error_t error; - - if (err == NULL) ---- src/seahorse-process-multiple.c -+++ src/seahorse-process-multiple.c -@@ -134,7 +134,7 @@ - GtkWidget *w; - gchar *x; - gboolean sep; -- gint sel; -+ gint sel = 0; - - g_assert (sctx); - g_assert (pkguri); diff --git a/seahorse.changes b/seahorse.changes index 24bd07e..1a574fc 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Wed Apr 11 11:24:22 CDT 2007 - maw@suse.de + +- Update to version 1.0.1 +- Many fixes: + * Fix a crash when deleting keys. + * Require GTK+ 2.10 without which 1.0 didn't build + * Use /tmp directory for agent sockets, so that seahorse + works for people with home directories on NFS/AFS + * Fixed importing of private keys from ssh-keygen + * Fixed checks for memory locking + * Epiphany plugin now builds with Epiphany 2.18 [Adam Schreiber] + * Set a default icon for all seahorse windows. + * Now able to use ports other than 22 when sending an SSH + key to another computer. + * Internationalization fixes [Bjoern Voigt] + * Handle openssh's authorized_keys file more cleanly + * Handle spaces in a search text when searching an LDAP server + * Help now works in 'Search Results' window [Adam Schreiber] + * Other minor fixes +- Updated translations for the ar, bg, ca, da, dz, el, es, et, fi, + fr, it, gu, ja, lt, mk, nb, pt, pt_BR, sv, and th locales. + +------------------------------------------------------------------- +Tue Apr 10 15:30:24 CDT 2007 - maw@suse.de + +- Add abuild.patch, to silence some warnings. + +------------------------------------------------------------------- +Tue Apr 10 12:02:26 CDT 2007 - maw@suse.de + +- Add openssh as an additional build requirement. + +------------------------------------------------------------------- +Mon Apr 9 16:48:24 CDT 2007 - maw@suse.de + +- Update to version 1.0 +- Remove seahorse-uninited.patch which no longer appears to apply +- Many fixes for bugzilla.gnome.org incl. #415808, #408774, #414078, + #411834, #408786, #410193, #408774, #406337, #408335, #375062, + #404386, #402856, #391666, #396009, #393218, #393366, #391699, + #391700, #363350, #387402, #357323, #349286, #336146, #354432, + #388318, #338730, #387293, #376729, #384781, #324674, #354245, + #358697, #362711, #382330, #374257, #377938, #376098, #376707, + #376098, #369536, #369616, #371636, #371666, #372099, #369874, + #363282, #351969, #368748, #366749, #355378, #364081, #361897, + #356794, #355380, #356302, #357317, #356550, #355386, #355378, + #355833, #355420, #355305, #353494, #354332, #354251, #354245, + #351935, #353595, #352808, #351836, #352868, #352364, #352332, + #345990, #352087, #351862, #351862, #351874, #351980, #351859, + #351850, #351833, #350206, #338287, #347872, #156306, #347869, + #349080, #348770, #347868, #339237, #339237, #341987, #347459, + #346418, #346038, #346040, #341986, #341986, #341986, #338743, + and #342005 +- No longer try to rename certain localizations +- Buildrequire gnome-doc-utils-devel + ------------------------------------------------------------------- Mon Apr 2 01:52:47 CEST 2007 - ro@suse.de diff --git a/seahorse.spec b/seahorse.spec index b74fd20..88a2c8e 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,5 +1,5 @@ # -# spec file for package seahorse (Version 0.8) +# spec file for package seahorse (Version 1.0.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,17 +11,17 @@ # norootforbuild Name: seahorse -BuildRequires: gnome-themes gpgme-devel intltool libglade2-devel libgnomeprintui-devel libsoup-devel libwnck-devel mDNSResponder-devel nautilus-devel openldap2 openldap2-devel perl-XML-Parser update-desktop-files +BuildRequires: gnome-doc-utils-devel gnome-themes 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: GNU General Public License (GPL) Group: System/GUI/GNOME Autoreqprov: on PreReq: gconf2 -Version: 0.8 -Release: 66 +Version: 1.0.1 +Release: 1 Summary: GNOME2 interface for gnupg Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 -Patch: %{name}-uninited.patch Patch2: %{name}-gpgme-version.patch +Patch3: abuild.patch URL: http://seahorse.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,30 +42,25 @@ Authors: %prep %setup -%patch %patch2 +%patch3 -p1 %build -rename no nb po/no.* -sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in %{?suse_update_config:%{suse_update_config -f}} autoreconf -f -i -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" \ - ./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --sysconfdir=%{_sysconfdir} \ - --libexecdir=%{_prefix}/lib/seahorse \ - --mandir=%{_mandir} \ - --localstatedir=/var/%_lib \ +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DWITH_SSH" +%configure \ + --with-ssh \ --disable-gedit make %install export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make -i install DESTDIR=$RPM_BUILD_ROOT -#remove the stuff we don't want +# remove the stuff we don't want... rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper +# ...everywhere. +rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a ( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic ) unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL @@ -106,16 +101,78 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog NEWS README %defattr (-, root, root) %{_prefix}/bin/* +%dir %{_libdir}/seahorse %{_libdir}/*.so* %{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so -%{_prefix}/share/applications/*.desktop -%{_prefix}/share/control-center-2.0 -%{_prefix}/share/mime-info -%{_prefix}/share/pixmaps/*.png -%{_prefix}/share/seahorse -%{_prefix}/share/mime/packages/seahorse.xml +%{_libdir}/seahorse/* +%{_libdir}/pkgconfig/*.pc +%dir %{_includedir}/libcryptui +%{_includedir}/libcryptui/*.h +%{_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 +%{_datadir}/man/man1/*.1.gz +%dir %{_datadir}/omf/seahorse +%{_datadir}/omf/seahorse/*.omf +%{_datadir}/pixmaps/*.png +%{_datadir}/pixmaps/*.svg +%dir %{_datadir}/pixmaps/seahorse +%dir %{_datadir}/pixmaps/seahorse/22x22 +%dir %{_datadir}/pixmaps/seahorse/48x48 +%dir %{_datadir}/pixmaps/seahorse/scalable +%{_datadir}/pixmaps/seahorse/*/*.png +%{_datadir}/pixmaps/seahorse/*/*.svg +%{_datadir}/seahorse +%{_datadir}/mime/packages/seahorse.xml %changelog +* Wed Apr 11 2007 - maw@suse.de +- Update to version 1.0.1 +- Many fixes: + * Fix a crash when deleting keys. + * Require GTK+ 2.10 without which 1.0 didn't build + * Use /tmp directory for agent sockets, so that seahorse + works for people with home directories on NFS/AFS + * Fixed importing of private keys from ssh-keygen + * Fixed checks for memory locking + * Epiphany plugin now builds with Epiphany 2.18 [Adam Schreiber] + * Set a default icon for all seahorse windows. + * Now able to use ports other than 22 when sending an SSH + key to another computer. + * Internationalization fixes [Bjoern Voigt] + * Handle openssh's authorized_keys file more cleanly + * Handle spaces in a search text when searching an LDAP server + * Help now works in 'Search Results' window [Adam Schreiber] + * Other minor fixes +- Updated translations for the ar, bg, ca, da, dz, el, es, et, fi, + fr, it, gu, ja, lt, mk, nb, pt, pt_BR, sv, and th locales. +* Tue Apr 10 2007 - maw@suse.de +- Add abuild.patch, to silence some warnings. +* Tue Apr 10 2007 - maw@suse.de +- Add openssh as an additional build requirement. +* Mon Apr 09 2007 - maw@suse.de +- Update to version 1.0 +- Remove seahorse-uninited.patch which no longer appears to apply +- Many fixes for bugzilla.gnome.org incl. #415808, #408774, #414078, + [#411834], #408786, #410193, #408774, #406337, #408335, #375062, + [#404386], #402856, #391666, #396009, #393218, #393366, #391699, + [#391700], #363350, #387402, #357323, #349286, #336146, #354432, + [#388318], #338730, #387293, #376729, #384781, #324674, #354245, + [#358697], #362711, #382330, #374257, #377938, #376098, #376707, + [#376098], #369536, #369616, #371636, #371666, #372099, #369874, + [#363282], #351969, #368748, #366749, #355378, #364081, #361897, + [#356794], #355380, #356302, #357317, #356550, #355386, #355378, + [#355833], #355420, #355305, #353494, #354332, #354251, #354245, + [#351935], #353595, #352808, #351836, #352868, #352364, #352332, + [#345990], #352087, #351862, #351862, #351874, #351980, #351859, + [#351850], #351833, #350206, #338287, #347872, #156306, #347869, + [#349080], #348770, #347868, #339237, #339237, #341987, #347459, + [#346418], #346038, #346040, #341986, #341986, #341986, #338743, + and #342005 +- No longer try to rename certain localizations +- Buildrequire gnome-doc-utils-devel * Mon Apr 02 2007 - ro@suse.de - updated gconf scriptlets * Mon Feb 05 2007 - ro@suse.de