diff --git a/seahorse-3.20.0.tar.xz b/seahorse-3.20.0.tar.xz deleted file mode 100644 index efb47dc..0000000 --- a/seahorse-3.20.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df -size 1556556 diff --git a/seahorse-3.30.tar.xz b/seahorse-3.30.tar.xz new file mode 100644 index 0000000..090e5c7 --- /dev/null +++ b/seahorse-3.30.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7d76e9d42123968dcacc44fe5d1405284ca17b0ebf1264e9dca854e3f0b72e9 +size 1435540 diff --git a/seahorse-gpg-ignore-key-considered.patch b/seahorse-gpg-ignore-key-considered.patch deleted file mode 100644 index b79198b..0000000 --- a/seahorse-gpg-ignore-key-considered.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cdfc5b297d7420e47b9c973e8b8cb1b0fb576421 Mon Sep 17 00:00:00 2001 -From: Tobias Mueller -Date: Tue, 14 Feb 2017 22:05:19 +0100 -Subject: [PATCH] gpg: Ignore KEY_CONSIDERED line introduced in gpg 2.1.13 - -gpg 2.1.13 introduced a new status line, KEY_CONSIDERED: -https://lists.gnupg.org/pipermail/gnupg-announce/2016q2/000390.html -gpgme 1.7.0 supported it: -https://lists.gnupg.org/pipermail/gnupg-commits/2016-May/012130.html - -The line seems innocent in the sense that it tells you what keys GnuPG -looked at without doing anything. We can probably safely ignore that -line, as we ignore many other lines already. - -https://bugzilla.gnome.org/show_bug.cgi?id=778607 - -Signed-off-by: Stef Walter - * Fixed this so it compiles ---- - configure.ac | 2 +- - pgp/seahorse-gpgme-key-op.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0f748e3d..fc4493c0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,7 +10,7 @@ GTK_REQ=3.4.0 - GTK_MAX=GTK_VERSION_3_4 - - GNUPG_ACCEPTED="2.0.12 2.1.4" --GPGME_REQUIRED=1.0.0 -+GPGME_REQUIRED=1.7.0 - LIBSECRET_REQUIRED=0.16 - AVAHI_GLIB_REQUIRED=0.6 - -diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c -index a765033b..3f81850d 100644 ---- a/pgp/seahorse-gpgme-key-op.c -+++ b/pgp/seahorse-gpgme-key-op.c -@@ -330,7 +330,8 @@ seahorse_gpgme_key_op_edit (gpointer data, gpgme_status_code_t status, - status == GPGME_STATUS_BAD_PASSPHRASE || status == GPGME_STATUS_USERID_HINT || - status == GPGME_STATUS_SIGEXPIRED || status == GPGME_STATUS_KEYEXPIRED || - status == GPGME_STATUS_PROGRESS || status == GPGME_STATUS_KEY_CREATED || -- status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE) -+ status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE || -+ status == GPGME_STATUS_KEY_CONSIDERED) - return parms->err; - - g_debug ("[edit key] state: %d / status: %d / args: %s", -diff -urp seahorse-3.20.0.orig/configure seahorse-3.20.0/configure ---- seahorse-3.20.0.orig/configure 2016-03-25 03:11:12.000000000 -0500 -+++ seahorse-3.20.0/configure 2018-01-15 14:54:04.920812407 -0600 -@@ -2533,7 +2533,7 @@ GTK_REQ=3.4.0 - GTK_MAX=GTK_VERSION_3_4 - - GNUPG_ACCEPTED="2.0.12 2.1.4" --GPGME_REQUIRED=1.0.0 -+GPGME_REQUIRED=1.7.0 - LIBSECRET_REQUIRED=0.16 - AVAHI_GLIB_REQUIRED=0.6 - diff --git a/seahorse-new-gnupg.patch b/seahorse-new-gnupg.patch deleted file mode 100644 index 53d87d0..0000000 --- a/seahorse-new-gnupg.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urp seahorse-3.20.0.orig/configure seahorse-3.20.0/configure ---- seahorse-3.20.0.orig/configure 2018-01-15 14:54:04.920812407 -0600 -+++ seahorse-3.20.0/configure 2018-01-15 14:54:49.000968502 -0600 -@@ -2532,7 +2532,7 @@ GCR_REQUIRED=3.11.91 - GTK_REQ=3.4.0 - GTK_MAX=GTK_VERSION_3_4 - --GNUPG_ACCEPTED="2.0.12 2.1.4" -+GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0" - GPGME_REQUIRED=1.7.0 - LIBSECRET_REQUIRED=0.16 - AVAHI_GLIB_REQUIRED=0.6 -diff -urp seahorse-3.20.0.orig/configure.ac seahorse-3.20.0/configure.ac ---- seahorse-3.20.0.orig/configure.ac 2018-01-15 14:53:40.608726375 -0600 -+++ seahorse-3.20.0/configure.ac 2018-01-15 14:54:44.244951654 -0600 -@@ -9,7 +9,7 @@ GCR_REQUIRED=3.11.91 - GTK_REQ=3.4.0 - GTK_MAX=GTK_VERSION_3_4 - --GNUPG_ACCEPTED="2.0.12 2.1.4" -+GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0" - GPGME_REQUIRED=1.7.0 - LIBSECRET_REQUIRED=0.16 - AVAHI_GLIB_REQUIRED=0.6 diff --git a/seahorse.changes b/seahorse.changes index 2029a10..b6330b9 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,99 @@ +------------------------------------------------------------------- +Sun Sep 23 07:57:29 UTC 2018 - antoine.belvire@opensuse.org + +- Update to version 3.30: + + Fix no window when launched from .desktop + (glgo#GNOME/seahorse#192, glgo#GNOME/seahorse#16). + + Show active window if available on launch + (glgo#GNOME/seahorse#18). + + Add debug logging for filtering. + + Make yelp documentation optional (glgo#GNOME/seahorse#17). + + Drop Continuous' configure script (glgo#GNOME/seahorse#12). + + Fix build on debian (glgo#GNOME/seahorse#190). + + Updated translations. +- Drop seahorse-fix-ldap-undefined-references.patch: Fixed + upstream. +- No longer recommend lang package as it already supplements main + package (same effect, it's redundant). + +------------------------------------------------------------------- +Fri Aug 31 22:07:18 UTC 2018 - luc14n0@linuxmail.org + +- Add seahorse-fix-ldap-undefined-references.patch provided by + upstream (glgo#GNOME/seahorse!15) and re-enable ldap support. + +------------------------------------------------------------------- +Fri Aug 31 00:30:31 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 3.29.92: + + gkr: fix segfault when trying to change default keyring + password (glgo#GNOME/seahorse#182). + + Fix - Cannot delete multi-selected SSH keys + (glgo#GNOME/seahorse#105, glgo#GNOME/seahorse!9). + + pgp: Seahorse again correctly filters keys for signing + (glgo#GNOME/seahorse!11). + + pgp: Search keys dialog now properly lists key servers again + (glgo#GNOME/seahorse!10). + + gkr: Fix lock/unlock button tooltip text in keyring properties + (glgo#GNOME/seahorse!5). + + Updated translations. +- Enable tests run to increase QA of package. + +------------------------------------------------------------------- +Wed Aug 15 00:20:12 UTC 2018 - luc14n0@linuxmail.org + +- Update to 3.29.91: + + pgp: remove non-working Help button (glgo#GNOME/seahorse#164). + + gkr: Fix lock/unlock button in keyring properties. + + ssh: Fix upload button. + + Use header bars more consistently. + + Updated translations. +- Changes from version 3.29.90: + + pgp: add hint when 'Full name' is not long enough (bgo#395805). + + gkr: ask for confirmation when saving changes (bgo#712348). + + gkr: Don't update key description if it doesn't change + (bgo#777802). + + ssh: modify the key length options based on the type of + encryption. + + ssh: add basic support for ECDSA and ED25519 keys (bgo#754028). + + Several small documentation fixes. + + Updated translations. +- Add: + + meson BuildRequires and replace configure/make/make_install + macros/command with meson/meson_build_meson_install, + respectively; and pass pgp-support, check-compatible-gpg, + pkcs11-support, keyservers-support, hkp-support, ldap-support, + key-sharing options to meson as true (upstream defaults), + following upstream port to Meson build system. + + glib-2.0, gobject-2.0, gio-unix-2.0 and gmodule-2.0 pkgconfig + modules as BuilRequires to avoid implicit dependencies. + + libpkcs11-helper-devel BuildRequires: this is needed for + PKCS#11 support. +- Drop: + + Fixed upstream patches: seahorse-new-gnupg.patch and + seahorse-gpg-ignore-key-considered.patch (bgo#778607). + + autoconf, and its autoreconf call, and automake BuildRequires: + they are no longer needed, they were added only because of the + previous dropped patches. + + intltool BuildRequires: this is no longer needed since upstream + migrated to Gettext. + + update-desktop-files BuildRequires and suse_update_desktop_file + macro: they are no longer needed. + + glib2_gsettings_schema_requires macro: this is no longer needed + since RPM file triggers (version >= 4.13). + + Pristine Obsoletes targeted at openSUSE release <= 12.1. +- Switch: + + libsecret-unstable and gck-1 pkgconfig modules to libsecret-1 + and gck-ui-3, respectively, to conform with meson dependency + checks. Note that libsecret-1 and gck-ui-3 were already being + used since they are provided by the same package as the + switched modules. + + gpgme-devel BuildRequire to libgpgme-devel: this is the right + openSUSE package name. +- Point fdupes to the datadir (/usr/share/) rather than the whole + buildroot, which is a practice that must be avoided when hard + linking. + ------------------------------------------------------------------- Tue Mar 27 15:40:00 UTC 2018 - dimstar@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index 0fb605d..7dcdcb6 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -12,49 +12,42 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: seahorse -Version: 3.20.0 +Version: 3.30 Release: 0 Summary: GNOME interface for gnupg -License: GPL-2.0-or-later +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.1-only Group: Productivity/Security URL: http://projects.gnome.org/seahorse/ -Source: http://download.gnome.org/sources/seahorse/3.20/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM seahorse-gpg-ignore-key-considered.patch bgo#778607 mgorse@suse.com -- ignore key_considered line introduced in gpg 2.1.13. -Patch0: seahorse-gpg-ignore-key-considered.patch -# PATCH-FIX-UPSTREAM seahorse-new-gnupg.patch bsc#1075928 mgorse@suse.com -- mark gnupg 2.2.x as supported. -Patch1: seahorse-new-gnupg.patch -# needed for patch1/patch2 -BuildRequires: autoconf -BuildRequires: automake +Source: http://download.gnome.org/sources/seahorse/3.30/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gpg2 -BuildRequires: gpgme-devel -BuildRequires: intltool +BuildRequires: libgpgme-devel +BuildRequires: meson BuildRequires: openldap2-devel BuildRequires: openssh +BuildRequires: pkcs11-helper-devel BuildRequires: pkgconfig BuildRequires: translation-update-upstream -BuildRequires: update-desktop-files -BuildRequires: vala >= 0.18.0 +BuildRequires: vala BuildRequires: yelp-tools BuildRequires: pkgconfig(avahi-client) -BuildRequires: pkgconfig(avahi-glib) -BuildRequires: pkgconfig(gck-1) >= 3.11.91 +BuildRequires: pkgconfig(avahi-glib) >= 0.6 BuildRequires: pkgconfig(gcr-3) >= 3.11.91 -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libsecret-unstable) >= 0.16 +BuildRequires: pkgconfig(gcr-ui-3) >= 3.11.91 +BuildRequires: pkgconfig(gio-2.0) >= 2.44 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.44 +BuildRequires: pkgconfig(glib-2.0) >= 2.44 +BuildRequires: pkgconfig(gmodule-2.0) >= 2.44 +BuildRequires: pkgconfig(gobject-2.0) >= 2.44 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 +BuildRequires: pkgconfig(libsecret-1) >= 0.16 BuildRequires: pkgconfig(libsoup-2.4) >= 2.33.92 -Recommends: %{name}-lang Obsoletes: %{name}-devel < %{version} -# We dropped seahorse-plugins in 12.1 -Obsoletes: seahorse-plugins <= 2.30.1.git.20110502 -%glib2_gsettings_schema_requires %description Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend. @@ -73,33 +66,37 @@ search results from seahorse. %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 translation-update-upstream %build -autoreconf -fiv -%configure -make %{?_smp_mflags} V=1 +%meson \ + -Dpgp-support=true \ + -Dcheck-compatible-gpg=true \ + -Dpkcs11-support=true \ + -Dkeyservers-support=true \ + -Dhkp-support=true \ + -Dldap-support=true \ + -Dkey-sharing=true \ + %{nil} +%meson_build + +%check +%meson_test %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print -%suse_update_desktop_file %{name} +%meson_install %find_lang %{name} %{?no_lang_C} -%fdupes %{buildroot} +%fdupes %{buildroot}%{_datadir} %files -%doc AUTHORS ChangeLog ChangeLog.pre-auto NEWS README +%license COPYING COPYING-DOCS COPYING.LIB +%doc AUTHORS NEWS README.md %doc %{_datadir}/help/C/%{name}/ %{_bindir}/seahorse -%{_libdir}/seahorse/ -%dir %{_datadir}/appdata -%{_datadir}/appdata/seahorse.appdata.xml +%{_libexecdir}/seahorse/ +%{_datadir}/metainfo/seahorse.appdata.xml %{_datadir}/applications/seahorse.desktop -%{_datadir}/GConf/gsettings/org.gnome.seahorse.convert -%{_datadir}/GConf/gsettings/org.gnome.seahorse.manager.convert %{_datadir}/glib-2.0/schemas/org.gnome.seahorse.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.seahorse.manager.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.seahorse.window.gschema.xml