From 6b57178da4c03224d6107d98ea19e6c410edace5f0066274430e4f046ec23258 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 27 May 2011 09:21:46 +0000 Subject: [PATCH 1/2] 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 From b06b3b379b52a2105febfbd9e199348d8c32894f218cd03596b7f9f51f28fd70 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 27 May 2011 14:49:11 +0000 Subject: [PATCH 2/2] Accepting request 71730 from home:vuntz:branches:GNOME:Factory Tweak + drop patch that should not be there OBS-URL: https://build.opensuse.org/request/show/71730 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/seahorse?expand=0&rev=97 --- seahorse-xsltproc-nonet.patch | 67 ----------------------------------- seahorse.changes | 12 +++++-- seahorse.spec | 6 ++-- 3 files changed, 12 insertions(+), 73 deletions(-) delete mode 100644 seahorse-xsltproc-nonet.patch diff --git a/seahorse-xsltproc-nonet.patch b/seahorse-xsltproc-nonet.patch deleted file mode 100644 index 63bd853..0000000 --- a/seahorse-xsltproc-nonet.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 - -+XSLTPROC=xsltproc --nonet -+ - ## @ DOC_H_FILE - ## The name of the header file to generate - DOC_H_FILE ?= -@@ -37,7 +39,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ -- xsltproc --path "$$xmlpath" $(_credits) $$doc; \ -+ $(XSLTPROC) --path "$$xmlpath" $(_credits) $$doc; \ - done | sort | uniq \ - | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ - | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp -@@ -50,7 +52,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); - docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ - echo $$xmlpath; \ -- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ -+ ids=`$(XSLTPROC) --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ - 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; \ -@@ -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; } -- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } -+ $(XSLTPROC) -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } - - ## @ _DOC_OMF_HTML - ## The OMF files for HTML output -@@ -195,7 +197,7 @@ if ENABLE_SK - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } - endif -- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } -+ $(XSLTPROC) -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } - - ## @ _DOC_OMF_ALL - ## All OMF output files to be built -@@ -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, \ -- $(shell xsltproc --xinclude \ -+ $(shell $(XSLTPROC) --xinclude \ - --stringparam db.chunk.basename "$(DOC_MODULE)" \ - $(_chunks) "C/$(DOC_MODULE).xml"), \ - C/$(f).xhtml) -@@ -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) -- xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) -+ $(XSLTPROC) -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) - - - ################################################################################ diff --git a/seahorse.changes b/seahorse.changes index 47b2ca5..c6faa4f 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 27 16:48:07 CEST 2011 - vuntz@opensuse.org + +- Drop seahorse-xsltproc-nonet.patch: this is really not the right + fix. It just appears that gnome-doc-utils is lacking a dependency + on docbook_4. + ------------------------------------------------------------------- Tue May 17 18:39:44 CEST 2011 - dimstar@opensuse.org @@ -7,8 +14,9 @@ Tue May 17 18:39:44 CEST 2011 - dimstar@opensuse.org + 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. +- Replace libgp11-devel BuildRequires with libgck-devel: gp11 + library has been removed from gnome-keyring since version 2.91.2, + but was replaced with libgck. ------------------------------------------------------------------- Wed Apr 27 10:50:21 UTC 2011 - fcrozat@novell.com diff --git a/seahorse.spec b/seahorse.spec index 74dbe5e..986f9cd 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -26,8 +26,6 @@ Release: 1 Summary: GNOME interface for gnupg Url: http://seahorse.sourceforge.net/ Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE seahorse-xsltproc-nonet.patch -Patch1: seahorse-xsltproc-nonet.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel @@ -37,6 +35,7 @@ BuildRequires: gpgme-devel BuildRequires: intltool BuildRequires: libavahi-glib-devel BuildRequires: libassuan-devel +BuildRequires: libgck-devel BuildRequires: libgcr-devel BuildRequires: libgnome-keyring-devel BuildRequires: libgpg-error-devel @@ -66,9 +65,8 @@ Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend. %lang_package %prep -%setup +%setup -q translation-update-upstream -%patch1 -p1 %build %configure --with-gtk=3.0 \