From 7d733fcb9dc2455a8697fb050596adf9b123fc8f Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Sat, 25 Oct 2014 09:10:47 +0200 Subject: [PATCH] Work around incompatibility introduced in GnuPG 2.0.23+ By using GnuPG 1.4.x --- seahorse.spec | 13 +++++++++---- set-gnupg-engine.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 set-gnupg-engine.patch diff --git a/seahorse.spec b/seahorse.spec index 7abf754..5adc7de 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,6 +1,6 @@ Name: seahorse Version: 3.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GNOME application for managing encryption keys Group: User Interface/Desktops # seahorse is GPLv2+ @@ -9,6 +9,7 @@ License: GPLv2+ and LGPLv2+ URL: http://projects.gnome.org/seahorse/ #VCS: git:git://git.gnome.org/seahorse Source: http://download.gnome.org/sources/seahorse/3.14/%{name}-%{version}.tar.xz +Patch0: set-gnupg-engine.patch BuildRequires: glib2-devel BuildRequires: gtk3-devel @@ -16,7 +17,7 @@ BuildRequires: gcr-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gpgme-devel >= 1.0 -BuildRequires: gnupg2 +BuildRequires: gnupg BuildRequires: itstool BuildRequires: libsoup-devel BuildRequires: openldap-devel @@ -51,10 +52,10 @@ operations. It is a keyring manager. %prep %setup -q - +%patch0 -p1 %build -GNUPG=/usr/bin/gpg2 ; export GNUPG ; %configure +GNUPG=/usr/bin/gpg ; export GNUPG ; %configure make %{?_smp_mflags} # cleanup permissions for files that go into debuginfo @@ -122,6 +123,10 @@ update-mime-database -n %{_datadir}/mime &> /dev/null || : %{_datadir}/gnome-shell/search-providers/seahorse-search-provider.ini %changelog +* Sat Oct 25 2014 Stef Walter - 3.14.0-2 +- Seahorse is not compatible with gnupg2 for now due to incompatible + upstream changes. + * Tue Sep 23 2014 Kalev Lember - 3.14.0-1 - Update to 3.14.0 - Drop last remnants of GConf schema handling diff --git a/set-gnupg-engine.patch b/set-gnupg-engine.patch new file mode 100644 index 0000000..53b271a --- /dev/null +++ b/set-gnupg-engine.patch @@ -0,0 +1,28 @@ +From cad4d259805840d912d3f20f76bc3f4cd57e9502 Mon Sep 17 00:00:00 2001 +From: Stef Walter +Date: Sat, 25 Oct 2014 08:44:33 +0200 +Subject: [PATCH] pgp: Force use of the first gnupg found by configure.ac + +Some people are having problems using recent versions of gpg2. +This allows configure.ac to identify a version during building +and then stick to using that one. +--- + pgp/seahorse-pgp-backend.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c +index ab9b8fb..4b267c3 100644 +--- a/pgp/seahorse-pgp-backend.c ++++ b/pgp/seahorse-pgp-backend.c +@@ -310,6 +310,8 @@ seahorse_pgp_backend_initialize (void) + g_object_unref (self); + + g_return_if_fail (pgp_backend != NULL); ++ ++ gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP, GNUPG, NULL); + } + + SeahorseGpgmeKeyring * +-- +2.1.0 + -- 2.1.0