OBS User unknown 2008-01-10 02:29:17 +00:00 committed by Git OBS Bridge
parent 5c060d394e
commit 0e58ceeb4d
8 changed files with 115 additions and 35 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf
size 2287702

3
seahorse-2.21.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c43e9ad7c70ca50c15884cb0c115f6954cd0a3815536ee8514713347b4952c4
size 2309767

View File

@ -1,13 +0,0 @@
Index: seahorse-1.0.1/src/seahorse.desktop.in.in
===================================================================
--- seahorse-1.0.1.orig/src/seahorse.desktop.in.in
+++ seahorse-1.0.1/src/seahorse.desktop.in.in
@@ -1,6 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Passwords and Encryption Keys
+_Name=Seahorse
+_GenericName=Passwords and Encryption Keys
_Comment=Manage your passwords and encryption keys
Exec=seahorse
Terminal=false

View File

@ -1,12 +0,0 @@
--- configure.in
+++ configure.in
@@ -102,6 +102,9 @@
ok="yes"
fi
fi
+ if test "$minor" -gt "$req_minor"; then
+ ok="yes"
+ fi
fi
fi

13
seahorse-strncat.patch Normal file
View File

@ -0,0 +1,13 @@
=== modified file 'libseahorse/seahorse-ssh-key-data.c'
--- libseahorse/seahorse-ssh-key-data.c 2008-01-09 22:52:51 +0000
+++ libseahorse/seahorse-ssh-key-data.c 2008-01-09 23:34:20 +0000
@@ -90,7 +90,7 @@
for (i = 0; i < MD5_LEN; i++) {
char hex[4];
snprintf (hex, sizeof (hex), "%02x:", (int)(digest[i]));
- strncat (fingerprint, hex, MD5_LEN * 3 + 1);
+ strncat (fingerprint, hex, strlen(fingerprint) - (MD5_LEN * 3 + 1) - 1);
}
/* Remove the trailing ':' character */

View File

@ -0,0 +1,67 @@
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
@@ -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; \
@@ -170,7 +172,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
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
@@ -185,7 +187,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
@@ -235,7 +237,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)
@@ -343,7 +345,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \
_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,$@)
################################################################################

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Jan 9 23:41:39 CET 2008 - maw@suse.de
- Update to 2.21.4:
+ Remove ssh proxy since gnome-keyring now has a proper ssh agent
+ Don't hardcode epiphany extensions directories
+ Improved gnome-keyring integration
+ UI and HIG improvements
+ Disable automatic key uploading/retrieval by default
+ Minor fixes
- Remove seahorse-desktop.patch because it has been upstreamed
- Actually remove seahorse-gpgme-version.patch
- Add seahorse-strncat.patch and seahorse-xsltproc-nonet.patch.
-------------------------------------------------------------------
Fri Dec 14 20:27:26 CET 2007 - jpr@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package seahorse (Version 2.20.1)
# spec file for package seahorse (Version 2.21.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -16,14 +16,14 @@ License: GPL v2 or later
Group: System/GUI/GNOME
AutoReqProv: on
PreReq: gconf2
Version: 2.20.1
Version: 2.21.4
Release: 1
Requires: %{name}-lang = %{version}
Summary: GNOME2 interface for gnupg
Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
Patch0: %{name}-gpgme-version.patch
# PATCH-FIX-UPSTREAM seahorse-abuild-warnings.patch bgo503648
Patch1: seahorse-desktop.patch
# Patch0: %{name}-gpgme-version.patch
Patch0: seahorse-strncat.patch
Patch1: seahorse-xsltproc-nonet.patch
Url: http://seahorse.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lst
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc AUTHORS ChangeLog NEWS README
%defattr (-, root, root)
%{_prefix}/bin/*
%dir %{_libdir}/seahorse
@ -156,6 +156,17 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libcryptui/*.h
%changelog
* Wed Jan 09 2008 - maw@suse.de
- Update to 2.21.4:
+ Remove ssh proxy since gnome-keyring now has a proper ssh agent
+ Don't hardcode epiphany extensions directories
+ Improved gnome-keyring integration
+ UI and HIG improvements
+ Disable automatic key uploading/retrieval by default
+ Minor fixes
- Remove seahorse-desktop.patch because it has been upstreamed
- Actually remove seahorse-gpgme-version.patch
- Add seahorse-strncat.patch and seahorse-xsltproc-nonet.patch.
* Fri Dec 14 2007 - jpr@suse.de
- Update to 2.20.1
* Fix selection of archive names when encrypting.