From 6b57178da4c03224d6107d98ea19e6c410edace5f0066274430e4f046ec23258 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 27 May 2011 09:21:46 +0000
Subject: [PATCH] Accepting request 71609 from
 home:dimstar:branches:GNOME:Factory

Tweak.. finally drop gp11-devel

OBS-URL: https://build.opensuse.org/request/show/71609
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=96
---
 seahorse-3.0.1.tar.bz2        |  3 ---
 seahorse-3.1.1.tar.bz2        |  3 +++
 seahorse-xsltproc-nonet.patch | 16 ++++++++--------
 seahorse.changes              | 12 ++++++++++++
 seahorse.spec                 |  3 +--
 5 files changed, 24 insertions(+), 13 deletions(-)
 delete mode 100644 seahorse-3.0.1.tar.bz2
 create mode 100644 seahorse-3.1.1.tar.bz2

diff --git a/seahorse-3.0.1.tar.bz2 b/seahorse-3.0.1.tar.bz2
deleted file mode 100644
index ccd960e..0000000
--- a/seahorse-3.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79efc22f9fe7db3d53a02be8bcf910be25aef0e321a49ec87a3a709f8aaaa912
-size 2546600
diff --git a/seahorse-3.1.1.tar.bz2 b/seahorse-3.1.1.tar.bz2
new file mode 100644
index 0000000..1608518
--- /dev/null
+++ b/seahorse-3.1.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:819cfb2ead0fbd2030d4da2141e5190cd9bafeaa3e9fdec4a4224a5da5e7cb47
+size 2549484
diff --git a/seahorse-xsltproc-nonet.patch b/seahorse-xsltproc-nonet.patch
index c2f95c3..63bd853 100644
--- a/seahorse-xsltproc-nonet.patch
+++ b/seahorse-xsltproc-nonet.patch
@@ -1,7 +1,7 @@
-diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
-index a5279cc..13a27e9 100644
---- a/gnome-doc-utils.make
-+++ b/gnome-doc-utils.make
+Index: seahorse-3.1.1/gnome-doc-utils.make
+===================================================================
+--- seahorse-3.1.1.orig/gnome-doc-utils.make
++++ seahorse-3.1.1/gnome-doc-utils.make
 @@ -23,6 +23,8 @@
  ################################################################################
  ## @@ Generating Header Files
@@ -29,7 +29,7 @@ index a5279cc..13a27e9 100644
  	  for id in $$ids; do \
  	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
  	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \
-@@ -170,7 +172,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
+@@ -180,7 +182,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %
  	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
  	  echo "Please check your ScrollKeeper installation." >&2;		\
  	  exit 1; }
@@ -38,7 +38,7 @@ index a5279cc..13a27e9 100644
  
  ## @ _DOC_OMF_HTML
  ## The OMF files for HTML output
-@@ -185,7 +187,7 @@ if ENABLE_SK
+@@ -195,7 +197,7 @@ if ENABLE_SK
  	  echo "Please check your ScrollKeeper installation." >&2;		\
  	  exit 1; }
  endif
@@ -47,7 +47,7 @@ index a5279cc..13a27e9 100644
  
  ## @ _DOC_OMF_ALL
  ## All OMF output files to be built
-@@ -235,7 +237,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),					\
+@@ -250,7 +252,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES),
  ## All HTML documentation in the C locale
  # FIXME: probably have to shell escape to determine the file names
  _DOC_C_HTML = $(foreach f,						\
@@ -56,7 +56,7 @@ index a5279cc..13a27e9 100644
  	  --stringparam db.chunk.basename "$(DOC_MODULE)"		\
  	  $(_chunks) "C/$(DOC_MODULE).xml"),				\
  	C/$(f).xhtml)
-@@ -343,7 +345,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
+@@ -379,7 +381,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
  _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
  
  $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
diff --git a/seahorse.changes b/seahorse.changes
index 67aaa31..47b2ca5 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue May 17 18:39:44 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 3.1.1:
+  + Fix up use of GcrCertificate
+  + Use pool.sks-keyservers.net instead of pgp.mit.edu
+  + Build fixes.
+  + Updated translations.
+- Rebase seahorse-xsltproc-nonet.patch.
+- Drop libgp11-devel BuildRequires: gp11 library has been removed
+  from gnome-kyering since version 2.91.2.
+
 -------------------------------------------------------------------
 Wed Apr 27 10:50:21 UTC 2011 - fcrozat@novell.com
 
diff --git a/seahorse.spec b/seahorse.spec
index ab3ecb8..74dbe5e 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -21,7 +21,7 @@
 Name:           seahorse
 License:        GPLv2+
 Group:          Productivity/Security
-Version:        3.0.1
+Version:        3.1.1
 Release:        1
 Summary:        GNOME interface for gnupg
 Url:            http://seahorse.sourceforge.net/
@@ -39,7 +39,6 @@ BuildRequires:  libavahi-glib-devel
 BuildRequires:  libassuan-devel
 BuildRequires:  libgcr-devel
 BuildRequires:  libgnome-keyring-devel
-BuildRequires:  libgp11-devel
 BuildRequires:  libgpg-error-devel
 BuildRequires:  libnotify-devel
 BuildRequires:  libsoup-devel