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

seahorse-2.24.1.tar.bz2

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

seahorse-2.25.4.tar.bz2

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

seahorse-fix-compiler-warning.patch

@@ -0,0 +1,32 @@
+--- ./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
++}

seahorse.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Thu Jan 29 00:15:37 CET 2009 - vuntz@novell.com
+
+- Own /usr/share/gnome/help to not depend on libgnome.
+
+-------------------------------------------------------------------
+Fri Jan 23 13:15:27 CET 2009 - vuntz@novell.com
+
+- Clean up file list, and move the autostart desktop file to
+  /etc/xdg/autostart (already done upstream in trunk)
+
+-------------------------------------------------------------------
+Thu Jan  8 07:45:36 EST 2009 - mboman@suse.de
+
+- Update to version 2.25.4:
+  + Fix crash when uploading ssh keys
+  + Code update for gp11 library changes
+- Remove seahorse-revert-get-slot.patch. Fixed upstream
+
+-------------------------------------------------------------------
+Wed Dec 24 06:56:07 EST 2008 - mboman@suse.de
+
+- Update to version 2.25.3:
+  + Massive refactoring
+  + Use g_timeout_add_seconds instead of g_timeout_add
+  + Fix display of expiry date time
+  + Autostart seahorse-daemon
+  + Various fixes
+  + Fix connecting to ssh servers not on port 22
+  + Translation updates
+- Add seahorse-revert-get-slot.patch. Reverts svn submission 2671
+
+-------------------------------------------------------------------
+Sat Dec 20 08:10:15 EST 2008 - mboman@suse.de
+
+- Update to version 2.25.1:
+  + Clean up GLib and GTK+ includes (GNOME Goal)
+  + Clean up errors in declaration of signal handlers
+  + Translation updates
+
 -------------------------------------------------------------------
 Tue Nov  4 23:32:57 CET 2008 - vuntz@novell.com
 

seahorse.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package seahorse (Version 2.24.1)
+# spec file for package seahorse (Version 2.25.4)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,17 +26,20 @@ BuildRequires:  libgpg-error-devel libsoup-devel
 BuildRequires:  libxml2-devel openldap2-devel
 BuildRequires:  openssh update-desktop-files
 BuildRequires:  gcc-c++ libnotify-devel
+BuildRequires:  libtasn1-devel
 License:        GPL v2 or later
 Group:          Productivity/Security
 AutoReqProv:    on
 PreReq:         gconf2
-Version:        2.24.1
+Version:        2.25.4
-Release:        2
+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
@@ -78,27 +81,29 @@ Authors:
 %prep
 %setup
 %patch1 -p1
+%patch2 -p0
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
-autoreconf -f -i
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DWITH_SSH"
 %configure
 make %{?jobs:-j%jobs}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 
+%makeinstall
-make -i install DESTDIR=$RPM_BUILD_ROOT
 # remove the stuff we don't want...
-rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper
+%{__rm} -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper
 # ...everywhere.
-rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
+%{__rm} -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+%{__rm} -f %{buildroot}%{_libdir}/*.*a
-( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic )
+%suse_update_desktop_file %{name} -G "Passwords and Encryption Keys" -N "Seahorse"
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 
+# Temporary workaround to not have to own /usr/share/gnome/autostart. Upstream
-%suse_update_desktop_file %{name} Security -G "Passwords and Encryption Keys" -N "Seahorse"
+# 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_lang %{name}-applet %{name}.lang
 %find_gconf_schemas
 cat %{name}.schemas_list >%{name}.lst
 %fdupes $RPM_BUILD_ROOT
@@ -138,8 +143,14 @@ 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
+# Temporary workaround to not depend on libgnome: own the directories
+%defattr (-, root, root)
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
 
 %files devel
 %defattr(-,root,root)
@@ -149,6 +160,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 29 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
+  /etc/xdg/autostart (already done upstream in trunk)
+* Thu Jan 08 2009 mboman@suse.de
+- Update to version 2.25.4:
+  + Fix crash when uploading ssh keys
+  + Code update for gp11 library changes
+- Remove seahorse-revert-get-slot.patch. Fixed upstream
+* Wed Dec 24 2008 mboman@suse.de
+- Update to version 2.25.3:
+  + Massive refactoring
+  + Use g_timeout_add_seconds instead of g_timeout_add
+  + Fix display of expiry date time
+  + Autostart seahorse-daemon
+  + Various fixes
+  + Fix connecting to ssh servers not on port 22
+  + Translation updates
+- Add seahorse-revert-get-slot.patch. Reverts svn submission 2671
+* Sat Dec 20 2008 mboman@suse.de
+- Update to version 2.25.1:
+  + Clean up GLib and GTK+ includes (GNOME Goal)
+  + Clean up errors in declaration of signal handlers
+  + Translation updates
 * Tue Nov 04 2008 vuntz@novell.com
 - Update BuildRequires since upstream split the packages with
   seahorse-plugins.