From 9405a2d762ed755d89061932d0cd6523af950d0a957c82f655d880fd44b59993 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 12 Feb 2009 21:51:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/seahorse?expand=0&rev=32 --- seahorse-2.25.4.tar.bz2 | 3 -- seahorse-2.25.90.tar.bz2 | 3 ++ seahorse-fix-compiler-warning.patch | 32 ------------- seahorse.changes | 13 ++++++ seahorse.spec | 72 +++++++++++++++++------------ 5 files changed, 59 insertions(+), 64 deletions(-) delete mode 100644 seahorse-2.25.4.tar.bz2 create mode 100644 seahorse-2.25.90.tar.bz2 delete mode 100644 seahorse-fix-compiler-warning.patch diff --git a/seahorse-2.25.4.tar.bz2 b/seahorse-2.25.4.tar.bz2 deleted file mode 100644 index 7acc671..0000000 --- a/seahorse-2.25.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55aeead4f67d723ed74533476decc4f147fb8679eaec48f02943339205900395 -size 2213818 diff --git a/seahorse-2.25.90.tar.bz2 b/seahorse-2.25.90.tar.bz2 new file mode 100644 index 0000000..4e70bd8 --- /dev/null +++ b/seahorse-2.25.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d5622e8777d7fa904c1f796956777d9c4f75de9d8c4e476f4f4b9dbded3fbb4 +size 2270818 diff --git a/seahorse-fix-compiler-warning.patch b/seahorse-fix-compiler-warning.patch deleted file mode 100644 index a5586e1..0000000 --- a/seahorse-fix-compiler-warning.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ./common/seahorse-registry.c.org 2009-01-08 07:56:32.000000000 +1100 -+++ ./common/seahorse-registry.c 2009-01-08 08:26:04.000000000 +1100 -@@ -87,7 +87,7 @@ lookup_category_values (GHashTable *tabl - g_return_val_if_fail (category[0], NULL); - - /* Get the first category */ -- set = g_hash_table_lookup (table, g_quark_try_string (category)); -+ set = g_hash_table_lookup (table, GUINT_TO_POINTER (g_quark_try_string (category))); - if (!set) - return NULL; - -@@ -105,7 +105,7 @@ lookup_category_values (GHashTable *tabl - g_return_val_if_fail (category[0], NULL); - - /* Lookup this category */ -- set = g_hash_table_lookup (table, g_quark_try_string (category)); -+ set = g_hash_table_lookup (table, GUINT_TO_POINTER (g_quark_try_string (category))); - - /* No category, no matches */ - if (!set) { -@@ -402,8 +402,8 @@ seahorse_registry_lookup_function (Seaho - pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry); - - va_start (cats, category); -- func = GPOINTER_TO_UINT (lookup_category_value (pv->functions, category, cats)); -+ func = lookup_category_value (pv->functions, category, cats); - va_end (cats); - - return func; --} -\ No newline at end of file -+} diff --git a/seahorse.changes b/seahorse.changes index 57bc5db..4fffefd 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Feb 5 15:49:18 EST 2009 - mboman@suse.de + +- Update to version 2.25.90: + + Removed libtasn1 dependency + + Additional refactoring + + seahorse-daemon registers with session manager properly + + gtk-doc for libcryptui + + Remove bits of libcryptui that are now handled by the gcr + library + from gnome-keyring + + Translation updates + ------------------------------------------------------------------- Thu Jan 29 00:15:37 CET 2009 - vuntz@novell.com diff --git a/seahorse.spec b/seahorse.spec index 77f5b1e..6081e35 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,5 +1,5 @@ # -# spec file for package seahorse (Version 2.25.4) +# spec file for package seahorse (Version 2.25.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,27 +19,34 @@ Name: seahorse -BuildRequires: fdupes gnome-doc-utils-devel -BuildRequires: gconf2-devel gnome-keyring-devel gpg2 gpgme-devel -BuildRequires: intltool libavahi-glib-devel libglade2-devel -BuildRequires: libgpg-error-devel libsoup-devel -BuildRequires: libxml2-devel openldap2-devel -BuildRequires: openssh update-desktop-files -BuildRequires: gcc-c++ libnotify-devel -BuildRequires: libtasn1-devel +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: gconf2-devel +BuildRequires: gnome-doc-utils-devel +BuildRequires: gnome-keyring-devel +BuildRequires: gpg2 +BuildRequires: gpgme-devel +BuildRequires: intltool +BuildRequires: libavahi-glib-devel +BuildRequires: libglade2-devel +BuildRequires: libgpg-error-devel +BuildRequires: libnotify-devel +BuildRequires: libsoup-devel +BuildRequires: libxml2-devel +BuildRequires: openldap2-devel +BuildRequires: openssh +BuildRequires: update-desktop-files License: GPL v2 or later Group: Productivity/Security AutoReqProv: on PreReq: gconf2 -Version: 2.25.4 +Version: 2.25.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-fix-compiler-warning.patch bgo#565649 mboman@suse.de -Patch2: seahorse-fix-compiler-warning.patch Url: http://seahorse.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -81,7 +88,6 @@ Authors: %prep %setup %patch1 -p1 -%patch2 -p0 %build %{?suse_update_config:%{suse_update_config -f}} @@ -97,11 +103,6 @@ make %{?jobs:-j%jobs} %{__rm} -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper %{__rm} -f %{buildroot}%{_libdir}/*.*a %suse_update_desktop_file %{name} -G "Passwords and Encryption Keys" -N "Seahorse" -# Temporary workaround to not have to own /usr/share/gnome/autostart. Upstream -# will move the file in the right directory. -install -d %{buildroot}%{_sysconfdir}/xdg/autostart -mv %{buildroot}%{_datadir}/gnome/autostart/seahorse-daemon.desktop %{buildroot}%{_sysconfdir}/xdg/autostart -# end of workaround %suse_update_desktop_file seahorse-daemon %find_lang %{name} %find_gconf_schemas @@ -143,7 +144,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/omf/seahorse/*.omf %{_datadir}/pixmaps/seahorse %{_datadir}/seahorse -%{_datadir}/cryptui %{_sysconfdir}/xdg/autostart/*.desktop %files lang -f %{name}.lang @@ -158,9 +158,23 @@ rm -rf $RPM_BUILD_ROOT %dir %{_includedir}/libcryptui %{_includedir}/libcryptui/*.h %{_libdir}/*.so +%{_datadir}/gtk-doc/html/libcryptui +# Own these repositories to not depend on gtk-doc while building: +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html %changelog -* Thu Jan 29 2009 vuntz@novell.com +* Thu Feb 05 2009 mboman@suse.de +- Update to version 2.25.90: + + Removed libtasn1 dependency + + Additional refactoring + + seahorse-daemon registers with session manager properly + + gtk-doc for libcryptui + + Remove bits of libcryptui that are now handled by the gcr + library + from gnome-keyring + + Translation updates +* Wed Jan 28 2009 vuntz@novell.com - Own /usr/share/gnome/help to not depend on libgnome. * Fri Jan 23 2009 vuntz@novell.com - Clean up file list, and move the autostart desktop file to @@ -217,7 +231,7 @@ rm -rf $RPM_BUILD_ROOT - removed traces of unused subpackages (part of bnc#420641) - added libnotify support - removed obsolete configure options -* Tue Sep 09 2008 mboman@novell.com +* Mon Sep 08 2008 mboman@novell.com - Update to version 2.23.92: + Fix crash when changing a stored Gnome Keyring password. + Fix certain crashes on syncing, searching and other operations. @@ -286,7 +300,7 @@ rm -rf $RPM_BUILD_ROOT - Create new subpackages (bnc#387472): + -gedit-plugin + -epiphany-plugin, which needs seahorse-ephy-2.22.patch. -* Wed May 07 2008 hpj@suse.de +* Tue May 06 2008 hpj@suse.de - Require gnome-panel-devel for building, so panel applet gets installed. - Add a category to one of the desktop files, so the keyring/encryption @@ -295,10 +309,10 @@ rm -rf $RPM_BUILD_ROOT - Update to version 2.22.1: + Remove code related to secure memory that was made unnecessary due to its functionality being provided by gnome-keyring. -* Fri Mar 14 2008 maw@suse.de +* Thu Mar 13 2008 maw@suse.de - Update to version 2.22.0: + Cosmetic version bump. -* Wed Mar 05 2008 maw@suse.de +* Tue Mar 04 2008 maw@suse.de - Update to version 2.21.92: + Documentation updates + Translation fixes. @@ -333,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT * Other UI and code fixes - Remove upstreamed patch seahourse-abuild-warnings.patch - Annotate seahourse-desktop.patch -* Wed Dec 05 2007 maw@suse.de +* Tue Dec 04 2007 maw@suse.de - Don't require openldap2 to build. * Wed Nov 21 2007 maw@suse.de - Rename abuild.patch to seahorse-abuild-warnings.patch @@ -383,7 +397,7 @@ rm -rf $RPM_BUILD_ROOT - s/gpg/gpg2/ in the buildreq - Add seahorse-gpg-version.patch to allow builds when only gpg2 is installed. -* Wed Jun 06 2007 ro@suse.de +* Tue Jun 05 2007 ro@suse.de - added gpg to buildreq * Mon Apr 16 2007 maw@suse.de - Create a -devel subpackage (#262572). @@ -432,9 +446,9 @@ rm -rf $RPM_BUILD_ROOT and #342005 - No longer try to rename certain localizations - Buildrequire gnome-doc-utils-devel -* Mon Apr 02 2007 ro@suse.de +* Sun Apr 01 2007 ro@suse.de - updated gconf scriptlets -* Mon Feb 05 2007 ro@suse.de +* Sun Feb 04 2007 ro@suse.de - GNOME moved to /usr * Thu Dec 07 2006 sbrabec@suse.cz - Fixed MIME database path in scriptlets (#225666). @@ -442,7 +456,7 @@ rm -rf $RPM_BUILD_ROOT - Do not touch obsolete run-scrollkeeper-update. * Mon Dec 04 2006 jhargadon@suse.de - removed ownership of /opt/gnome/share/mime (#225667) -* Mon Sep 04 2006 ro@suse.de +* Sun Sep 03 2006 ro@suse.de - fix build (find icon file) * Tue Jul 18 2006 nadvornik@suse.cz - fixed check for minimal gpgme version