From 150119ce6447edc6bc44d3617af51c341346fab1d69026f52f2ebf934412752e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 27 Aug 2013 08:38:04 +0000 Subject: [PATCH] Accepting request 196475 from home:dimstar:branches:GNOME:Factory resubbed OBS-URL: https://build.opensuse.org/request/show/196475 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=149 --- seahorse-3.9.1.tar.xz | 3 - seahorse-3.9.90.tar.xz | 3 + seahorse-remove-bad-help-buttons.patch | 87 -------------------------- seahorse.changes | 24 ++++++- seahorse.spec | 11 ++-- 5 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 seahorse-3.9.1.tar.xz create mode 100644 seahorse-3.9.90.tar.xz delete mode 100644 seahorse-remove-bad-help-buttons.patch diff --git a/seahorse-3.9.1.tar.xz b/seahorse-3.9.1.tar.xz deleted file mode 100644 index aec2adc..0000000 --- a/seahorse-3.9.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0d92b008efb7a4aee9f6542c53e8a8b92f9dacf768ed639d301f23648a8c457 -size 1971036 diff --git a/seahorse-3.9.90.tar.xz b/seahorse-3.9.90.tar.xz new file mode 100644 index 0000000..7a3ca40 --- /dev/null +++ b/seahorse-3.9.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74bd6b8bd1dae36e852c2aaf5b1f40d0d3baffc3286f6ca3223fd3a7e72fb7e1 +size 2108676 diff --git a/seahorse-remove-bad-help-buttons.patch b/seahorse-remove-bad-help-buttons.patch deleted file mode 100644 index 38caff6..0000000 --- a/seahorse-remove-bad-help-buttons.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 97dab1647bdc2f50d642eb0278bc3399b4beb7ac Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Tue, 19 Feb 2013 22:27:28 -0600 -Subject: [PATCH] Remove gkr-keyring, gkr-item-properties help - -There is no article associated with these buttons, and there's not -really any need for Help on these pages anyway. (bnc#804181) - -Various other patches including a varient of this one have been proposed -upstream at bgo#659834; none have been accepted as of yet ---- - gkr/seahorse-gkr-item-properties.xml | 17 ----------------- - gkr/seahorse-gkr-keyring.xml | 17 ----------------- - 2 files changed, 34 deletions(-) - -diff --git a/gkr/seahorse-gkr-item-properties.xml b/gkr/seahorse-gkr-item-properties.xml -index 7e38ecb..7a66e23 100644 ---- a/gkr/seahorse-gkr-item-properties.xml -+++ b/gkr/seahorse-gkr-item-properties.xml -@@ -360,22 +360,6 @@ - True - end - -- -- gtk-help -- True -- True -- True -- False -- True -- -- -- -- False -- False -- 0 -- -- -- - - gtk-close - True -@@ -401,7 +385,6 @@ - - - -- helpbutton1 - closebutton1 - - -diff --git a/gkr/seahorse-gkr-keyring.xml b/gkr/seahorse-gkr-keyring.xml -index e9a6c03..3474e53 100644 ---- a/gkr/seahorse-gkr-keyring.xml -+++ b/gkr/seahorse-gkr-keyring.xml -@@ -145,22 +145,6 @@ - True - end - -- -- gtk-help -- True -- True -- True -- False -- True -- -- -- -- False -- False -- 0 -- -- -- - - gtk-close - True -@@ -186,7 +170,6 @@ - - - -- helpbutton1 - closebutton1 - - --- -1.8.1.1 diff --git a/seahorse.changes b/seahorse.changes index bb3ae1d..f95f739 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Aug 26 17:12:00 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.90: + + Show the sidebar by default (bgo#705592). + + ssh: Bump the minimum key size to 768 bits (bgo#705561). + + Add "DesktopSettings;X-XFCE-SettingsDialog;" to .desktop + categories (bgo#704981). + + pgp: Put the 'Comment' field in the advanced section of PGP key + gen (bgo#703766). + + Only permit import from clipboard when data is available + (bgo#703394). + + soup: use the SoupProxyResolverDefault feature (bgo#682495). + + pgp: Fix uninitialized memory access. + + Port some of seahorse to vala code. + + Build fixes (bgo#702602, bgo#699147). + + Translation fixes (bgo#699116). + + Updated translations. +- Drop seahorse-remove-bad-help-buttons.patch: fixed upstream. + ------------------------------------------------------------------- Wed May 1 08:18:42 UTC 2013 - dimstar@opensuse.org @@ -866,13 +886,13 @@ Sat Aug 02 16:45:12 CEST 2008 - captain.magnus@opensuse.org + Use the vala programming language for some code. + Add initial infrastructure for PKCS#11 key/certificate support. + Save and load window sizes from gconf. [Adam Schreiber] - * Build fixes [Brian Cameron, Saleem Abdulrasool, Alexis Ballier, + + Build fixes [Brian Cameron, Saleem Abdulrasool, Alexis Ballier, Christian Persch, Rodrigo Moya] ------------------------------------------------------------------- Fri Jul 18 16:45:12 CEST 2008 - rodrigo@suse.de -- Tag and upstream patches +- Tag and upstream patches. ------------------------------------------------------------------- Mon Jun 30 19:06:02 CEST 2008 - maw@suse.de diff --git a/seahorse.spec b/seahorse.spec index c3db76b..374d2b1 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -17,15 +17,13 @@ Name: seahorse -Version: 3.9.1 +Version: 3.9.90 Release: 0 Summary: GNOME interface for gnupg License: GPL-2.0+ Group: Productivity/Security Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.9/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE bnc#804181 bgo#659834 mike.catanzaro@gmail.com -- Remove help buttons that point to nowhere, submitted but not yet reviewed upstream -Patch0: seahorse-remove-bad-help-buttons.patch BuildRequires: fdupes BuildRequires: gpg2 BuildRequires: gpgme-devel @@ -39,11 +37,11 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(avahi-glib) BuildRequires: pkgconfig(gck-1) >= 3.3.4 -BuildRequires: pkgconfig(gcr-3) >= 3.3.4 +BuildRequires: pkgconfig(gcr-3) >= 3.9.1 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libsecret-unstable) >= 0.5 -BuildRequires: pkgconfig(libsoup-2.4) >= 2.24.0 +BuildRequires: pkgconfig(libsecret-unstable) >= 0.16 +BuildRequires: pkgconfig(libsoup-2.4) >= 2.33.92 Recommends: %{name}-lang Obsoletes: %{name}-devel < %{version} # We dropped seahorse-plugins in 12.1 @@ -69,7 +67,6 @@ search results from documents. %prep %setup -q translation-update-upstream -%patch0 -p1 %build %configure \