From b7d4abd2310e0a50991e9d774cb4ebea376a042a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 04:54:29 +0000
Subject: import seahorse-nautilus-3.11.92-11.el7


---

diff --git a/.gitignore b/.gitignore
index a45f24c..95d8446 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/seahorse-nautilus-3.8.0.tar.xz
+SOURCES/seahorse-nautilus-3.11.92.tar.xz
diff --git a/.seahorse-nautilus.metadata b/.seahorse-nautilus.metadata
index 424de8a..95c42f5 100644
--- a/.seahorse-nautilus.metadata
+++ b/.seahorse-nautilus.metadata
@@ -1 +1 @@
-dae8e2a5fb007fb5519da73a827cd407ba35bfd2 SOURCES/seahorse-nautilus-3.8.0.tar.xz
+a37a9ae8268f9963f5d73f98c34272e68ea13bab SOURCES/seahorse-nautilus-3.11.92.tar.xz
diff --git a/SOURCES/Add-correct-flag-for-reaping-the-progress-child.patch b/SOURCES/Add-correct-flag-for-reaping-the-progress-child.patch
deleted file mode 100644
index 3a2792a..0000000
--- a/SOURCES/Add-correct-flag-for-reaping-the-progress-child.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c41f07cf5785b2d755b85f20bf0546c6ce2ebb02 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@redhat.com>
-Date: Fri, 16 Aug 2013 19:24:11 +0200
-Subject: [PATCH] Add correct flag for reaping the progress child
-
-This fixes the WARNING about ECHILD that comes from some versions
-of glib. The WARNING was removed in later versions of glib, but this
-is also a good fix.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697895
----
- tool/seahorse-tool-progress.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tool/seahorse-tool-progress.c b/tool/seahorse-tool-progress.c
-index 613e82f..c039118 100644
---- a/tool/seahorse-tool-progress.c
-+++ b/tool/seahorse-tool-progress.c
-@@ -217,7 +217,7 @@ seahorse_tool_progress_start (const gchar *title)
-     argv[2] = (gchar *)title;
-     argv[3] = NULL;
- 
--    ret = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_SEARCH_PATH,
-+    ret = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
-                                     NULL, NULL, &progress_pid, &progress_fd, NULL, NULL, &err);
- 
-     if (!ret) {
--- 
-1.8.3.1
diff --git a/SOURCES/seahorse-tool-man.patch b/SOURCES/seahorse-tool-man.patch
deleted file mode 100644
index 6592502..0000000
--- a/SOURCES/seahorse-tool-man.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up seahorse-nautilus-3.8.0/tool/seahorse-tool.1.man seahorse-nautilus-3.8.0/tool/seahorse-tool.1
---- seahorse-nautilus-3.8.0/tool/seahorse-tool.1.man	2011-10-24 03:25:37.000000000 -0400
-+++ seahorse-nautilus-3.8.0/tool/seahorse-tool.1	2013-11-01 06:44:46.254075433 -0400
-@@ -41,6 +41,9 @@ Encrypt FILE.
- \fB\-s \fR\fIFILE\fR, \fB\-\-sign \fR\fIFILE\fR
- Sign FILE with default key.
- .TP
-+\fB\-n \fR\fIFILE\fR, \fB\-\-encrypt-sign \fR\fIFILE\fR
-+Encrypt and sign FILE with default key.
-+.TP
- \fB\-d \fR\fIFILE\fR, \fB\-\-decrypt \fR\fIFILE\fR
- Decrypt encrypted FILE.
- .TP
-@@ -52,6 +55,9 @@ Read list of URIs on standard in.
- .TP
- \fB\-\-version\fR
- Show version information and exit.
-+.TP
-+\fB\-h, \-\-help\fR
-+Show help options.
- .\" End List
- 
- .SS "Additional options"
diff --git a/SPECS/seahorse-nautilus.spec b/SPECS/seahorse-nautilus.spec
index d544369..b958df7 100644
--- a/SPECS/seahorse-nautilus.spec
+++ b/SPECS/seahorse-nautilus.spec
@@ -1,17 +1,12 @@
 Name:           seahorse-nautilus
-Version:        3.8.0
+Version:        3.11.92
 %global         release_version %(echo %{version} | awk -F. '{print $1"."$2}')
-Release:        5%{?dist}
+Release:        11%{?dist}
 Summary:        PGP encryption and signing for nautilus
 License:        GPLv2+
 URL:            https://live.gnome.org/Seahorse
 Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/%{release_version}/%{name}-%{version}.tar.xz
 
-# improve man page
-Patch0: seahorse-tool-man.patch
-# rhbz#1093123
-Patch1: Add-correct-flag-for-reaping-the-progress-child.patch
-
 BuildRequires:  gtk3-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcr-devel
@@ -33,17 +28,15 @@ and decryption of OpenPGP files using GnuPG.
 
 %prep
 %setup -q
-%patch0 -p1 -b .man
-%patch1 -p1 -b .sigchld
 
 
 %build
-%configure --disable-silent-rules
+%configure --disable-silent-rules --disable-gpg-check
 make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/seahorse-pgp-encrypted.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/seahorse-pgp-keys.desktop
@@ -65,7 +58,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files -f %{name}.lang
-%doc AUTHORS COPYING NEWS README THANKS
+%license COPYING
+%doc AUTHORS NEWS README THANKS
 %{_bindir}/seahorse-tool
 %{_libdir}/nautilus/extensions-3.0/libnautilus-seahorse.so
 %{_datadir}/applications/*.desktop
@@ -76,6 +70,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Wed Jun 06 2018 Richard Hughes <rhughes@redhat.com> - 3.11.92-11
+- Update to 3.11.92
+- Resolves: #1569784
+
 * Fri May  2 2014 Rui Matos <rmatos@redhat.com> - 3.8.0-5
 - Fix for "seahorse-nautilus broken by glib2 regression related to
   SIGCHLD warnings"