SHA256
1
0
forked from pool/seahorse

Accepting request 132987 from GNOME:Next

No longer mangle with names... the upstream ones are good enough

OBS-URL: https://build.opensuse.org/request/show/132987
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=130
This commit is contained in:
Vincent Untz 2012-09-07 15:25:59 +00:00 committed by Git OBS Bridge
parent d8a1ccd440
commit 00b31ae723
5 changed files with 50 additions and 34 deletions

View File

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

3
seahorse-3.5.91.tar.xz Normal file
View File

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

View File

@ -1,22 +0,0 @@
From f8a0cfcfc78f487447a347309affa6acadcfe77f Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Mon, 30 Apr 2012 18:29:42 +0000
Subject: Fix typo in finalizing of GPGME keyring
---
diff --git a/pgp/seahorse-gpgme-keyring.c b/pgp/seahorse-gpgme-keyring.c
index 79ff39b..579ab09 100644
--- a/pgp/seahorse-gpgme-keyring.c
+++ b/pgp/seahorse-gpgme-keyring.c
@@ -859,7 +859,7 @@ seahorse_gpgme_keyring_finalize (GObject *object)
{
SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object);
- g_clear_object (self->pv->actions);
+ g_clear_object (&self->pv->actions);
g_hash_table_destroy (self->pv->keys);
/* All monitoring and scheduling should be done */
--
cgit v0.9.0.2

View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Thu Sep 6 14:23:04 UTC 2012 - dimstar@opensuse.org
- No longer mangle Generic name and Name of the programs entry in
the menus / activities screen:
+ Remove -G "Passwords and Keys" -N "Seahorse" from the
suse_update_desktop_file call (bnc#779068).
-------------------------------------------------------------------
Mon Sep 3 09:32:43 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.91:
+ Updated translations.
-------------------------------------------------------------------
Mon Aug 20 17:25:13 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.90:
+ Updated translations.
-------------------------------------------------------------------
Wed Jul 18 09:16:21 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.4:
+ No keyring UI bits if failed to connect to Secret Service
+ When Ctrl-F pressed in the main window, focus the filter box
+ Add suggestion to generate entropy while generating a key
+ Use libsecret instead of libgnome-keyring
+ Use GcrSecureEntryBuffer and remove duplicate code.
+ Align keyids with name/signatures in key properties.
+ Unavailable entries were displayed incorrectly for signatures
+ Fix icon sizes
+ Remove unused code
+ Migrate to GtkApplication
+ Other bug fixes
+ Build fixes
+ Updated translations.
- Replace pkgconfig(gnome-keyring-1) BuildRequires with
pkgconfig(libsecret-unstable), following upstreams switch.
- Drop xz BuildRequires as it now comes for free in the build
system.
- Drop seahorse-gpgme-keyring.patch: fixed upstream.
-------------------------------------------------------------------
Fri May 18 18:18:48 UTC 2012 - dimstar@opensuse.org

View File

@ -17,15 +17,13 @@
Name: seahorse
Version: 3.4.1
Version: 3.5.91
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.4/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM seahorse-gpgme-keyring.patch dimstar@opensuse.org -- Fix typo in finalizing of GPGME keyring, taken from git.
Patch0: seahorse-gpgme-keyring.patch
Source: http://download.gnome.org/sources/seahorse/3.5/%{name}-%{version}.tar.xz
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: gpg2
@ -35,15 +33,13 @@ BuildRequires: openldap2-devel
BuildRequires: openssh
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
BuildRequires: pkgconfig(avahi-client)
BuildRequires: pkgconfig(avahi-glib)
BuildRequires: pkgconfig(gck-1) >= 3.3.4
BuildRequires: pkgconfig(gcr-3) >= 3.3.4
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libsecret-unstable) >= 0.5
BuildRequires: pkgconfig(libsoup-2.4)
Recommends: %{name}-lang
Obsoletes: %{name}-devel < %{version}
@ -58,7 +54,6 @@ Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build
@ -72,7 +67,7 @@ make %{?jobs:-j%jobs} V=1
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%{__rm} -f %{buildroot}%{_libdir}/*.*a
%suse_update_desktop_file -G "Passwords and Keys" -N "Seahorse" %{name}
%suse_update_desktop_file %{name}
%find_lang %{name} %{?no_lang_C}
%fdupes $RPM_BUILD_ROOT