This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
89d22709fa
commit
ac17b87f47
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c0b217462274eb07223c97651e15e633c2fa1087886362848e94cd696158aeba
|
|
||||||
size 2121631
|
|
||||||
3
seahorse-2.23.6.tar.bz2
Normal file
3
seahorse-2.23.6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:26b47e031ab6ee472d9cf9562d0d3fdc1e88248bf2902c73375f3a9ac2cb5ee1
|
||||||
|
size 2165479
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- configure.in
|
|
||||||
+++ configure.in
|
|
||||||
@@ -26,6 +26,8 @@ AM_CONFIG_HEADER(config.h)
|
|
||||||
AM_MAINTAINER_MODE
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
|
||||||
|
|
||||||
+AC_PROG_CC
|
|
||||||
+AC_PROG_CXX
|
|
||||||
AC_PROG_INTLTOOL([0.35.0])
|
|
||||||
AM_PROG_LIBTOOL
|
|
||||||
AM_GCONF_SOURCE_2
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
--- plugins/epiphany/seahorse-extension.c 2008/03/16 22:26:26 1.1
|
|
||||||
+++ plugins/epiphany/seahorse-extension.c 2008/03/16 22:53:30
|
|
||||||
@@ -25,6 +25,7 @@
|
|
||||||
|
|
||||||
#include <epiphany/ephy-extension.h>
|
|
||||||
#include <epiphany/ephy-embed.h>
|
|
||||||
+#include <epiphany/ephy-embed-container.h>
|
|
||||||
|
|
||||||
#include "eel-gconf-extensions.h"
|
|
||||||
#include "ephy-debug.h"
|
|
||||||
@@ -239,7 +240,7 @@ encrypt_seahorse_cb (GtkAction *action,
|
|
||||||
|
|
||||||
init_crypt();
|
|
||||||
|
|
||||||
- embed = ephy_window_get_active_embed (window);
|
|
||||||
+ embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
|
|
||||||
g_return_if_fail (EPHY_IS_EMBED (embed));
|
|
||||||
|
|
||||||
/* ask gecko for the input */
|
|
||||||
@@ -285,7 +286,7 @@ sign_seahorse_cb (GtkAction *action, Eph
|
|
||||||
|
|
||||||
init_crypt();
|
|
||||||
|
|
||||||
- embed = ephy_window_get_active_embed (window);
|
|
||||||
+ embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
|
|
||||||
g_return_if_fail (EPHY_IS_EMBED (embed));
|
|
||||||
|
|
||||||
/* ask gecko for the input */
|
|
||||||
@@ -419,7 +420,7 @@ dvi_seahorse_cb (GtkAction *action, Ephy
|
|
||||||
|
|
||||||
init_crypt();
|
|
||||||
|
|
||||||
- embed = ephy_window_get_active_embed (window);
|
|
||||||
+ embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
|
|
||||||
g_return_if_fail (EPHY_IS_EMBED (embed));
|
|
||||||
|
|
||||||
/* ask gecko for the input */
|
|
||||||
--- plugins/epiphany/mozilla/mozilla-helper.cpp 2008/03/16 22:22:38 1.1
|
|
||||||
+++ plugins/epiphany/mozilla/mozilla-helper.cpp 2008/03/16 22:24:17
|
|
||||||
@@ -78,8 +78,10 @@ extern "C" gboolean
|
|
||||||
mozilla_is_input (EphyEmbed *embed)
|
|
||||||
{
|
|
||||||
nsCOMPtr<nsIWebBrowser> browser;
|
|
||||||
- gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
|
|
||||||
+ gtk_moz_embed_get_nsIWebBrowser (
|
|
||||||
+ GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
|
|
||||||
getter_AddRefs (browser));
|
|
||||||
+ NS_ENSURE_TRUE (browser, FALSE);
|
|
||||||
nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
|
|
||||||
if (!focus) return FALSE;
|
|
||||||
|
|
||||||
@@ -100,9 +102,11 @@ extern "C" const char*
|
|
||||||
mozilla_get_text (EphyEmbed *embed)
|
|
||||||
{
|
|
||||||
nsCOMPtr<nsIWebBrowser> browser;
|
|
||||||
- gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
|
|
||||||
+ gtk_moz_embed_get_nsIWebBrowser (
|
|
||||||
+ GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
|
|
||||||
getter_AddRefs (browser));
|
|
||||||
nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
|
|
||||||
+ NS_ENSURE_TRUE (browser, NULL);
|
|
||||||
if (!focus)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
@@ -139,8 +143,10 @@ extern "C" void
|
|
||||||
mozilla_set_text (EphyEmbed *embed, char *new_text)
|
|
||||||
{
|
|
||||||
nsCOMPtr<nsIWebBrowser> browser;
|
|
||||||
- gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
|
|
||||||
+ gtk_moz_embed_get_nsIWebBrowser (
|
|
||||||
+ GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
|
|
||||||
getter_AddRefs (browser));
|
|
||||||
+ NS_ENSURE_TRUE (browser, );
|
|
||||||
nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
|
|
||||||
if (!focus) return;
|
|
||||||
|
|
||||||
@ -1,189 +0,0 @@
|
|||||||
---
|
|
||||||
configure.in | 7 +++++++
|
|
||||||
m4/gecko.m4 | 31 ++++++++++++++++++++++++++++---
|
|
||||||
2 files changed, 35 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
Index: seahorse-2.21.91/m4/gecko.m4
|
|
||||||
===================================================================
|
|
||||||
--- seahorse-2.21.91.orig/m4/gecko.m4
|
|
||||||
+++ seahorse-2.21.91/m4/gecko.m4
|
|
||||||
@@ -46,31 +46,34 @@
|
|
||||||
|
|
||||||
# ************************
|
|
||||||
# Check which gecko to use
|
|
||||||
# ************************
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([which gecko to use])
|
|
||||||
|
|
||||||
AC_ARG_WITH([gecko],
|
|
||||||
- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
|
|
||||||
+ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-unstable@:>@],
|
|
||||||
[Which gecko engine to use (autodetected by default)]))
|
|
||||||
|
|
||||||
# Backward compat
|
|
||||||
AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[])
|
|
||||||
|
|
||||||
gecko_cv_gecko=$with_gecko
|
|
||||||
|
|
||||||
# Autodetect gecko
|
|
||||||
-_geckos="firefox mozilla-firefox seamonkey mozilla xulrunner"
|
|
||||||
+_geckos="firefox mozilla-firefox seamonkey mozilla xulrunner libxul-unstable"
|
|
||||||
if test -z "$gecko_cv_gecko"; then
|
|
||||||
for lizard in $_geckos; do
|
|
||||||
if $PKG_CONFIG --exists $lizard-xpcom; then
|
|
||||||
gecko_cv_gecko=$lizard
|
|
||||||
break;
|
|
||||||
+ elif $PKG_CONFIG --exists $lizard; then
|
|
||||||
+ gecko_cv_gecko=$lizard
|
|
||||||
+ break;
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_RESULT([$gecko_cv_gecko])
|
|
||||||
|
|
||||||
if test "x$gecko_cv_gecko" = "x"; then
|
|
||||||
ifelse([$3],,[AC_MSG_ERROR([No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package])],[$3])
|
|
||||||
@@ -88,21 +91,28 @@
|
|
||||||
|
|
||||||
if test "$gecko_cv_have_gecko" = "yes"; then
|
|
||||||
|
|
||||||
case "$gecko_cv_gecko" in
|
|
||||||
mozilla) gecko_cv_gecko_flavour=mozilla ;;
|
|
||||||
seamonkey) gecko_cv_gecko_flavour=mozilla ;;
|
|
||||||
*firefox) gecko_cv_gecko_flavour=toolkit ;;
|
|
||||||
xulrunner) gecko_cv_gecko_flavour=toolkit ;;
|
|
||||||
+libxul*) gecko_cv_gecko_flavour=toolkit ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
+if test $gecko_cv_gecko = libxul-unstable; then
|
|
||||||
+_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
|
|
||||||
+_GECKO_HOME=""
|
|
||||||
+_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
|
|
||||||
+else
|
|
||||||
_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
|
|
||||||
+fi
|
|
||||||
|
|
||||||
fi # if gecko_cv_have_gecko
|
|
||||||
|
|
||||||
if test "$gecko_cv_gecko_flavour" = "toolkit"; then
|
|
||||||
AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[1],[Define if mozilla is of the toolkit flavour])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_gecko_flavour" = "toolkit"])
|
|
||||||
@@ -349,27 +359,34 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_LANG_PUSH([C++])
|
|
||||||
|
|
||||||
_SAVE_CPPFLAGS="$CPPFLAGS"
|
|
||||||
_SAVE_CXXFLAGS="$CXXFLAGS"
|
|
||||||
_SAVE_LDFLAGS="$LDFLAGS"
|
|
||||||
_SAVE_LIBS="$LIBS"
|
|
||||||
+if test $gecko_cv_gecko = libxul-unstable; then
|
|
||||||
+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko})"
|
|
||||||
+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko})"
|
|
||||||
+LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
|
|
||||||
+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko})"
|
|
||||||
+else
|
|
||||||
CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
|
|
||||||
CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
|
|
||||||
LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
|
|
||||||
LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
|
|
||||||
+fi
|
|
||||||
|
|
||||||
_GECKO_DISPATCH_INCLUDEDIRS="$2"
|
|
||||||
|
|
||||||
# Sigh Gentoo has a rubbish header layout
|
|
||||||
# http://bugs.gentoo.org/show_bug.cgi?id=100804
|
|
||||||
# Mind you, it's useful to be able to test against uninstalled mozilla builds...
|
|
||||||
-_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
|
|
||||||
+_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref unstable"
|
|
||||||
|
|
||||||
# Now add them to CPPFLAGS
|
|
||||||
for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
|
|
||||||
CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
|
|
||||||
done
|
|
||||||
|
|
||||||
m4_indir([$1],m4_shiftn(2,$@))
|
|
||||||
|
|
||||||
@@ -585,21 +602,29 @@
|
|
||||||
#
|
|
||||||
# Variables set:
|
|
||||||
# XPIDL: the xpidl program
|
|
||||||
# XPIDL_IDLDIR: the xpidl include directory
|
|
||||||
|
|
||||||
AC_DEFUN([GECKO_XPIDL],
|
|
||||||
[AC_REQUIRE([GECKO_INIT])dnl
|
|
||||||
|
|
||||||
+if test $gecko_cv_gecko = libxul-unstable; then
|
|
||||||
+_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
|
|
||||||
+else
|
|
||||||
_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
+fi
|
|
||||||
|
|
||||||
AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
|
|
||||||
|
|
||||||
+if test $gecko_cv_gecko = libxul-unstable; then
|
|
||||||
+XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`/unstable"
|
|
||||||
+else
|
|
||||||
XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
+fi
|
|
||||||
|
|
||||||
# Older geckos don't have this variable, see
|
|
||||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=240473
|
|
||||||
|
|
||||||
if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
|
|
||||||
XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
Index: seahorse-2.21.91/configure.in
|
|
||||||
===================================================================
|
|
||||||
--- seahorse-2.21.91.orig/configure.in
|
|
||||||
+++ seahorse-2.21.91/configure.in
|
|
||||||
@@ -505,16 +505,17 @@
|
|
||||||
if test "$with_epiphany_plugin" = "yes"; then
|
|
||||||
AC_SUBST([MOZILLA])
|
|
||||||
AC_SUBST([MOZILLA_FLAVOUR])
|
|
||||||
AC_SUBST([MOZILLA_HOME])
|
|
||||||
AC_SUBST([MOZILLA_PREFIX])
|
|
||||||
AC_SUBST([MOZILLA_INCLUDE_ROOT])
|
|
||||||
|
|
||||||
case "$MOZILLA" in
|
|
||||||
+ libxul-unstable) min_version=1.9 ;;
|
|
||||||
xulrunner) min_version=1.8 ;;
|
|
||||||
*firefox) min_version=1.5 ;;
|
|
||||||
*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
|
|
||||||
libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
|
|
||||||
libglade-2.0 \
|
|
||||||
@@ -587,19 +588,25 @@
|
|
||||||
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
|
|
||||||
epiphany-2.14 >= $EPIPHANY_REQUIRED],
|
|
||||||
[with_epiphany_plugin=yes E_API_VERSION=2.14 e_api_minor=14],[with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])])])])])])])])])
|
|
||||||
else
|
|
||||||
echo "disabling epiphany plugin"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$with_epiphany_plugin" = "yes"; then
|
|
||||||
+ if test $gecko_cv_gecko = libxul-unstable; then
|
|
||||||
+ PKG_CHECK_MODULES([MOZILLA_COMPONENT],
|
|
||||||
+ [${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies],
|
|
||||||
+ [with_epiphany_plugin=yes],[with_epiphany_plugin=no echo "disabling epiphany plugin"])
|
|
||||||
+ else
|
|
||||||
PKG_CHECK_MODULES([MOZILLA_COMPONENT],
|
|
||||||
[${gecko_cv_gecko}-xpcom >= $min_version $gecko_cv_extra_pkg_dependencies],
|
|
||||||
[with_epiphany_plugin=yes],[with_epiphany_plugin=no echo "disabling epiphany plugin"])
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$with_epiphany_plugin" = "yes"; then
|
|
||||||
echo "enabling epiphany plugin"
|
|
||||||
|
|
||||||
if test "$e_api_minor" -ge 21; then
|
|
||||||
AC_DEFINE([EPHY_NOTAB], 1, [Defines whether EphyTab exists in the API])
|
|
||||||
else
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
=== 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 */
|
|
||||||
|
|
||||||
@ -1,3 +1,46 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 05 16:45:12 CEST 2008 - captain.magnus@opensuse.org
|
||||||
|
|
||||||
|
- Updated to 2.23.6
|
||||||
|
+ Initial PKCS#11 certificate listing implementation.
|
||||||
|
+ Internal code refactoring.
|
||||||
|
+ Fix problems with reference counting on operations.
|
||||||
|
+ Use base64 functions in glib, rather than rolling our own.
|
||||||
|
+ Don't use deprecated LDAP functions. [Adam Schreiber]
|
||||||
|
+ String operation fixes. [Adam Schreiber]
|
||||||
|
+ Build fixes [Jeff Cai]
|
||||||
|
- Removed seahorse-strncat.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Aug 02 16:45:12 CEST 2008 - captain.magnus@opensuse.org
|
||||||
|
|
||||||
|
- Removed seahorse-configure.patch
|
||||||
|
- Removed seahorse-ephy-2.22.patch (Plugins are gone)
|
||||||
|
- Removed seahorse-mozilla-xulrunner19.patch (gecko.m4 is no more)
|
||||||
|
- Updated to 2.23.5
|
||||||
|
+ Fix importing keys from key servers [Mackenzie Morgan]
|
||||||
|
+ Factor out seahorse-plugins to a different module.
|
||||||
|
+ Add XDS drag and drop support.
|
||||||
|
+ Remove gnome-vfs dependency and use gio instead.
|
||||||
|
+ Return key id of signer from DBus service even when key
|
||||||
|
is not found locally [Adam Schreiber]
|
||||||
|
+ Refactor UI code internally into modules.
|
||||||
|
+ Remove hard GPG and GPGME dependency.
|
||||||
|
+ Replace signer drop down in key chooser with just a check
|
||||||
|
button when only one secret key exists. [Adam Schreiber]
|
||||||
|
+ Set sync button insensitive when no server is selected.
|
||||||
|
[Adam Schreiber]
|
||||||
|
+ Test for secure memory before using it. [Coleman Kane]
|
||||||
|
+ Change trust model used to match GPG's. [Adam Schreiber]
|
||||||
|
+ Remove libgnome and libgnomeui dependencies. [Saleem Abdulrasool]
|
||||||
|
+ Grab keyboard focus when prompting for password.
|
||||||
|
[Josselin Mouette]
|
||||||
|
+ Use the vala programming language for some code.
|
||||||
|
+ Add initial infrastructure for PKCS#11 key/certificate support.
|
||||||
|
+ Save and load window sizes from gconf. [Adam Schreiber]
|
||||||
|
* Build fixes [Brian Cameron, Saleem Abdulrasool, Alexis Ballier,
|
||||||
|
Christian Persch, Rodrigo Moya]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 18 16:45:12 CEST 2008 - rodrigo@suse.de
|
Fri Jul 18 16:45:12 CEST 2008 - rodrigo@suse.de
|
||||||
|
|
||||||
|
|||||||
101
seahorse.spec
101
seahorse.spec
@ -1,10 +1,17 @@
|
|||||||
#
|
#
|
||||||
# spec file for package seahorse (Version 2.22.2)
|
# spec file for package seahorse (Version 2.23.6)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 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.
|
|
||||||
#
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
@ -12,7 +19,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: seahorse
|
Name: seahorse
|
||||||
BuildRequires: epiphany-devel fdupes gedit-devel gnome-doc-utils-devel gnome-panel-devel gnome-themes gnome-vfs2-devel gpg2 gpgme-devel intltool libavahi-glib-devel libglade2-devel libgnomeprintui-devel libgpg-error-devel libsoup-devel libwnck-devel libxml2-devel nautilus-devel openldap2-devel openssh perl-XML-Parser update-desktop-files
|
BuildRequires: epiphany-devel fdupes gedit-devel gnome-doc-utils-devel gnome-panel-devel gnome-themes gpg2 gpgme-devel gvfs-devel intltool libavahi-glib-devel libglade2-devel libgnomeprintui-devel libgpg-error-devel libsoup-devel libwnck-devel libxml2-devel nautilus-devel openldap2-devel openssh perl-XML-Parser update-desktop-files
|
||||||
# for the epiphany plugin:
|
# for the epiphany plugin:
|
||||||
%define xulrunner_version 181
|
%define xulrunner_version 181
|
||||||
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
|
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
|
||||||
@ -21,21 +28,13 @@ License: GPL v2 or later
|
|||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
PreReq: gconf2
|
PreReq: gconf2
|
||||||
Version: 2.22.2
|
Version: 2.23.6
|
||||||
Release: 12
|
Release: 1
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
Summary: GNOME2 interface for gnupg
|
Summary: GNOME2 interface for gnupg
|
||||||
Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
|
Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
|
||||||
# PATCH-FIX-UPSTREAM seahorse-strncat.patch bgo543601
|
|
||||||
Patch0: seahorse-strncat.patch
|
|
||||||
# PATCH-FIX-OPENSUSE seahorse-xsltproc-nonet.patch
|
# PATCH-FIX-OPENSUSE seahorse-xsltproc-nonet.patch
|
||||||
Patch1: seahorse-xsltproc-nonet.patch
|
Patch1: seahorse-xsltproc-nonet.patch
|
||||||
# PATCH-FIX-UPSTREAM seahorse-ephy-2.22.patch -- These come from http://patches.ubuntu.com/by-release/extracted/ubuntu/s/seahorse/2.22.1-0ubuntu2/
|
|
||||||
Patch2: seahorse-ephy-2.22.patch
|
|
||||||
# PATCH-NEEDS-REBASE seahorse-mozilla-xulrunner19.patch -- Disable this one for now until epiphany builds against xulrunner 19
|
|
||||||
Patch3: seahorse-mozilla-xulrunner19.patch
|
|
||||||
# PATCH-FIX-UPSTREAM seahorse-configure.patch bgo543602
|
|
||||||
Patch4: seahorse-configure.patch
|
|
||||||
Url: http://seahorse.sourceforge.net/
|
Url: http://seahorse.sourceforge.net/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%gconf_schemas_prereq
|
%gconf_schemas_prereq
|
||||||
@ -123,11 +122,7 @@ Authors:
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
%patch0
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2
|
|
||||||
### %patch3 -p1
|
|
||||||
%patch4
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{?suse_update_config:%{suse_update_config -f}}
|
%{?suse_update_config:%{suse_update_config -f}}
|
||||||
@ -146,18 +141,14 @@ rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper
|
|||||||
# ...everywhere.
|
# ...everywhere.
|
||||||
rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
|
rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
|
||||||
rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
|
rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
|
||||||
rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.*a
|
#rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.*a
|
||||||
rm $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins/*.*a
|
#rm $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins/*.*a
|
||||||
rm $RPM_BUILD_ROOT/%{_libdir}/epiphany/%_epiphany_major_version/extensions/*.*a
|
#rm $RPM_BUILD_ROOT/%{_libdir}/epiphany/%_epiphany_major_version/extensions/*.*a
|
||||||
( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic )
|
( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic )
|
||||||
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
||||||
%suse_update_desktop_file %{name} Security -G "Passwords and Encryption Keys" -N "Seahorse"
|
%suse_update_desktop_file %{name} Security -G "Passwords and Encryption Keys" -N "Seahorse"
|
||||||
%suse_update_desktop_file %{name}-pgp-preferences Security X-SuSE-ControlCenter-Personal
|
|
||||||
%suse_update_desktop_file %{name}-pgp-signature Security
|
|
||||||
%suse_update_desktop_file %{name}-pgp-keys Security
|
|
||||||
%suse_update_desktop_file %{name}-pgp-encrypted Security
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
%find_lang %{name}-applet %{name}.lang
|
## %find_lang %{name}-applet %{name}.lang
|
||||||
%find_gconf_schemas
|
%find_gconf_schemas
|
||||||
cat %{name}.schemas_list >%{name}.lst
|
cat %{name}.schemas_list >%{name}.lst
|
||||||
%fdupes $RPM_BUILD_ROOT
|
%fdupes $RPM_BUILD_ROOT
|
||||||
@ -189,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_prefix}/bin/*
|
%{_prefix}/bin/*
|
||||||
%dir %{_libdir}/seahorse
|
%dir %{_libdir}/seahorse
|
||||||
%{_libdir}/*.so*
|
%{_libdir}/*.so*
|
||||||
%{_libdir}/nautilus/extensions-2.0/libnautilus-seahorse.so
|
|
||||||
%{_libdir}/seahorse/*
|
%{_libdir}/seahorse/*
|
||||||
%{_datadir}/applications/*.desktop
|
%{_datadir}/applications/*.desktop
|
||||||
%{_datadir}/dbus-1/services/org.gnome.seahorse.service
|
%{_datadir}/dbus-1/services/org.gnome.seahorse.service
|
||||||
@ -207,11 +197,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/pixmaps/seahorse/*/*.png
|
%{_datadir}/pixmaps/seahorse/*/*.png
|
||||||
%{_datadir}/pixmaps/seahorse/*/*.svg
|
%{_datadir}/pixmaps/seahorse/*/*.svg
|
||||||
%{_datadir}/seahorse
|
%{_datadir}/seahorse
|
||||||
%{_datadir}/mime/packages/seahorse.xml
|
|
||||||
%{_libdir}/bonobo/servers/GNOME_SeahorseApplet.server
|
|
||||||
%{_datadir}/gnome-2.0/ui/GNOME_SeahorseApplet.xml
|
|
||||||
%dir %{_datadir}/omf/seahorse-applet
|
|
||||||
%{_datadir}/omf/seahorse-applet/*.omf
|
|
||||||
|
|
||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
@ -221,22 +206,44 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir %{_includedir}/libcryptui
|
%dir %{_includedir}/libcryptui
|
||||||
%{_includedir}/libcryptui/*.h
|
%{_includedir}/libcryptui/*.h
|
||||||
|
|
||||||
%files gedit-plugin
|
|
||||||
%defattr(-, root, root)
|
|
||||||
%dir %{_libdir}/gedit-2
|
|
||||||
%dir %{_libdir}/gedit-2/plugins
|
|
||||||
%{_libdir}/gedit-2/plugins/libseahorse-pgp.so
|
|
||||||
%{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
|
|
||||||
|
|
||||||
%files epiphany-plugin
|
|
||||||
%defattr(-, root, root)
|
|
||||||
%dir %{_libdir}/epiphany
|
|
||||||
%dir %{_libdir}/epiphany/%_epiphany_major_version
|
|
||||||
%dir %{_libdir}/epiphany/%_epiphany_major_version/extensions
|
|
||||||
%{_libdir}/epiphany/%_epiphany_major_version/extensions/seahorse.ephy-extension
|
|
||||||
%{_libdir}/epiphany/%_epiphany_major_version/extensions/*.so
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 05 2008 captain.magnus@opensuse.org
|
||||||
|
- Updated to 2.23.6
|
||||||
|
+ Initial PKCS#11 certificate listing implementation.
|
||||||
|
+ Internal code refactoring.
|
||||||
|
+ Fix problems with reference counting on operations.
|
||||||
|
+ Use base64 functions in glib, rather than rolling our own.
|
||||||
|
+ Don't use deprecated LDAP functions. [Adam Schreiber]
|
||||||
|
+ String operation fixes. [Adam Schreiber]
|
||||||
|
+ Build fixes [Jeff Cai]
|
||||||
|
- Removed seahorse-strncat.patch
|
||||||
|
* Sat Aug 02 2008 captain.magnus@opensuse.org
|
||||||
|
- Removed seahorse-configure.patch
|
||||||
|
- Removed seahorse-ephy-2.22.patch (Plugins are gone)
|
||||||
|
- Removed seahorse-mozilla-xulrunner19.patch (gecko.m4 is no more)
|
||||||
|
- Updated to 2.23.5
|
||||||
|
+ Fix importing keys from key servers [Mackenzie Morgan]
|
||||||
|
+ Factor out seahorse-plugins to a different module.
|
||||||
|
+ Add XDS drag and drop support.
|
||||||
|
+ Remove gnome-vfs dependency and use gio instead.
|
||||||
|
+ Return key id of signer from DBus service even when key
|
||||||
|
is not found locally [Adam Schreiber]
|
||||||
|
+ Refactor UI code internally into modules.
|
||||||
|
+ Remove hard GPG and GPGME dependency.
|
||||||
|
+ Replace signer drop down in key chooser with just a check
|
||||||
|
button when only one secret key exists. [Adam Schreiber]
|
||||||
|
+ Set sync button insensitive when no server is selected.
|
||||||
|
[Adam Schreiber]
|
||||||
|
+ Test for secure memory before using it. [Coleman Kane]
|
||||||
|
+ Change trust model used to match GPG's. [Adam Schreiber]
|
||||||
|
+ Remove libgnome and libgnomeui dependencies. [Saleem Abdulrasool]
|
||||||
|
+ Grab keyboard focus when prompting for password.
|
||||||
|
[Josselin Mouette]
|
||||||
|
+ Use the vala programming language for some code.
|
||||||
|
+ Add initial infrastructure for PKCS#11 key/certificate support.
|
||||||
|
+ Save and load window sizes from gconf. [Adam Schreiber]
|
||||||
|
* Build fixes [Brian Cameron, Saleem Abdulrasool, Alexis Ballier,
|
||||||
|
Christian Persch, Rodrigo Moya]
|
||||||
* Fri Jul 18 2008 rodrigo@suse.de
|
* Fri Jul 18 2008 rodrigo@suse.de
|
||||||
- Tag and upstream patches
|
- Tag and upstream patches
|
||||||
* Mon Jun 30 2008 maw@suse.de
|
* Mon Jun 30 2008 maw@suse.de
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user