From 2f355e253c8cf8be401cac91b55e71107f58fd1278079e055bc291a39f3414ce Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 23 Aug 2014 11:52:50 +0000 Subject: [PATCH 1/2] Accepting request 245960 from GNOME:Next Push GNOME 3.13.90 OBS-URL: https://build.opensuse.org/request/show/245960 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=165 --- seahorse-allow-deprecated.patch | 41 +++++++++++++++++++++++++++++++++ seahorse.changes | 9 ++++++++ seahorse.spec | 6 +++-- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 seahorse-allow-deprecated.patch diff --git a/seahorse-allow-deprecated.patch b/seahorse-allow-deprecated.patch new file mode 100644 index 0000000..d73acba --- /dev/null +++ b/seahorse-allow-deprecated.patch @@ -0,0 +1,41 @@ +Index: seahorse-3.12.2/libegg/Makefile.am +=================================================================== +--- seahorse-3.12.2.orig/libegg/Makefile.am ++++ seahorse-3.12.2/libegg/Makefile.am +@@ -2,16 +2,8 @@ noinst_LIBRARIES += \ + libeggdatetime.a \ + libeggtreemultidnd.a + +-libeggdatetime_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED +- + libeggdatetime_a_CFLAGS = $(GTK_CFLAGS) + libeggdatetime_a_SOURCES = libegg/egg-datetime.h libegg/egg-datetime.c + +-libeggtreemultidnd_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED +- + libeggtreemultidnd_a_CFLAGS = $(GTK_CFLAGS) + libeggtreemultidnd_a_SOURCES = libegg/eggtreemultidnd.c libegg/eggtreemultidnd.h +Index: seahorse-3.12.2/Makefile.in +=================================================================== +--- seahorse-3.12.2.orig/Makefile.in ++++ seahorse-3.12.2/Makefile.in +@@ -860,15 +860,8 @@ common_BUILT = \ + $(common_HEADER) \ + common/common.vapi + +-libeggdatetime_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED +- + libeggdatetime_a_CFLAGS = $(GTK_CFLAGS) + libeggdatetime_a_SOURCES = libegg/egg-datetime.h libegg/egg-datetime.c +-libeggtreemultidnd_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED + + libeggtreemultidnd_a_CFLAGS = $(GTK_CFLAGS) + libeggtreemultidnd_a_SOURCES = libegg/eggtreemultidnd.c libegg/eggtreemultidnd.h diff --git a/seahorse.changes b/seahorse.changes index 7c0671c..fb559c5 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 15 00:02:29 UTC 2014 - dimstar@opensuse.org + +- Add seahorse-allow-deprecated.patch: Allow the usage of + deprecated GTK+ symbols. +- No longer pass --disable-scrollkeeper to configure: this hasn't + been supported since version 3.5.92 when the switched from + gnome-devel-docs to Mallard happened. + ------------------------------------------------------------------- Sat May 17 08:08:26 UTC 2014 - zaitor@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index d5a56eb..34c99c7 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Security Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM seahorse-allow-deprecated.patch dimstar@opensuse.org -- Allow the usage of deprecated GTK+ symbols +Patch0: seahorse-allow-deprecated.patch BuildRequires: fdupes BuildRequires: gpg2 BuildRequires: gpgme-devel @@ -66,11 +68,11 @@ search results from seahorse. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build -%configure \ - --disable-scrollkeeper +%configure make %{?_smp_mflags} V=1 %install From d4321c879c803bb973602cb78fe1855c2590d7ed68de80db15bec159f07e8598 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 25 Sep 2014 07:43:53 +0000 Subject: [PATCH 2/2] Accepting request 251955 from GNOME:Next Push GNOME 3.14.0 OBS-URL: https://build.opensuse.org/request/show/251955 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=166 --- seahorse-3.12.2.tar.xz | 3 --- seahorse-3.14.0.tar.xz | 3 +++ seahorse.changes | 16 ++++++++++++++++ seahorse.spec | 4 ++-- 4 files changed, 21 insertions(+), 5 deletions(-) delete mode 100644 seahorse-3.12.2.tar.xz create mode 100644 seahorse-3.14.0.tar.xz diff --git a/seahorse-3.12.2.tar.xz b/seahorse-3.12.2.tar.xz deleted file mode 100644 index b762eb7..0000000 --- a/seahorse-3.12.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839 -size 1398292 diff --git a/seahorse-3.14.0.tar.xz b/seahorse-3.14.0.tar.xz new file mode 100644 index 0000000..396453e --- /dev/null +++ b/seahorse-3.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ea22830f5af1a11fadbdd8da6b34513410f2c371d9ec75fbf9b9b2d9177fc8a +size 1450280 diff --git a/seahorse.changes b/seahorse.changes index fb559c5..ca17a4d 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 23 09:27:18 UTC 2014 - dimstar@opensuse.org + +- Update to version 3.14.0: + + Fix crash in search provider (bgo#733957). + + Display 'Certify' and 'Authenticate' names for GPG key flags + (bgo#733920). + + Prettify fingerprint downloaded from key server (bgo#719872). + + When searching for keys request full fingerprint (bgo#719872). + + Show whether subkeys can be used for signing/encryption + (bgo#730044). + + Remove incorrect tooltip from 'New Keyring' dialog + (bgo#733399). + + Updated translations + + Build fixes (bgo#732396). + ------------------------------------------------------------------- Tue Jul 15 00:02:29 UTC 2014 - dimstar@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index 34c99c7..85df1f7 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -17,13 +17,13 @@ Name: seahorse -Version: 3.12.2 +Version: 3.14.0 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.12/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/seahorse/3.14/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM seahorse-allow-deprecated.patch dimstar@opensuse.org -- Allow the usage of deprecated GTK+ symbols Patch0: seahorse-allow-deprecated.patch BuildRequires: fdupes