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
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
6b57178da4
commit
b06b3b379b
@ -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,$@)
|
||||
|
||||
|
||||
################################################################################
|
||||
@ -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
|
||||
|
||||
@ -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 \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user