commit seahorse-plugins for openSUSE:Factory

Hello community, here is the log from the commit of package seahorse-plugins for openSUSE:Factory checked in at Fri Aug 7 22:52:33 CEST 2009. -------- --- seahorse-plugins/seahorse-plugins.changes 2009-07-19 11:54:05.000000000 +0200 +++ seahorse-plugins/seahorse-plugins.changes 2009-08-04 14:48:56.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Aug 4 13:17:10 CEST 2009 - vuntz@novell.com + +- Add seahorse-plugins-no-ephy.patch to fix build with epiphany + 2.27. It means we lost the epiphany plugin for now, though. +- Add gnome-common BuildRequires and call gnome-autogen.sh for the + patch. +- Remove BuildRequires on mozilla-xulrunner-devel and gcc-c++, + since it was only there for the epiphany plugin. +- Disable the seahorse-plugins-epiphany package for now. +- Remove epiphany BuildRequires: it should be brought by the + epiphany-devel BuildRequires anyway. +- Leave epiphany-devel BuildRequires so that when seahorse-plugins + is ported to a newer epiphany, we'll get the plugin again. +- Add seahorse-plugins-build-fix.patch to fix build error about + large file support, and remove the custom CFLAGS. +- Pass --disable-static and --disable-schemas-install to configure. +- Remove handling of old mime system, which doesn't exist anymore. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- seahorse-plugins-build-fix.patch seahorse-plugins-no-ephy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seahorse-plugins.spec ++++++ --- /var/tmp/diff_new_pack.1HqEke/_old 2009-08-07 22:51:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1HqEke/_new 2009-08-07 22:51:24.000000000 +0200 @@ -20,9 +20,7 @@ Name: seahorse-plugins Version: 2.27.1 -Release: 2 -# For directory ownership: -BuildRequires: epiphany +Release: 3 BuildRequires: epiphany-devel BuildRequires: fdupes # For directory ownership: @@ -38,15 +36,17 @@ BuildRequires: seahorse-devel BuildRequires: shared-mime-info BuildRequires: update-desktop-files -# for the epiphany plugin: -%define xulrunner_version 190 -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel -BuildRequires: gcc-c++ +# Needed by the patch +BuildRequires: gnome-common License: GFDL v1.1 ; GPL v2 or later Group: Productivity/Security Requires: %{name}-lang = %{version} Summary: Plugins for the seahorse cryptography interface Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM seahorse-plugins-no-ephy.patch vuntz@novell.com -- Taken from git +Patch0: seahorse-plugins-no-ephy.patch +# PATCH-FIX-UPSTREAM seahorse-plugins-build-fix.patch bgo590723 vuntz@novell.com +Patch1: seahorse-plugins-build-fix.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -75,7 +75,7 @@ %package epiphany # When epiphany is updated, _epiphany_major_version will need to be too. -%define _epiphany_major_version 2.26 +%define _epiphany_major_version 2.27 License: GFDL v1.1 ; GPL v2 or later Summary: Plugins for the seahorse cryptography interface Group: System/GUI/GNOME @@ -124,22 +124,21 @@ %lang_package %prep %setup +%patch0 -p1 +%patch1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" +NOCONFIGURE=1 gnome-autogen.sh %configure \ + --disable-static \ --disable-update-mime-database \ + --disable-schemas-install \ --disable-scrollkeeper make %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %makeinstall -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -rm $RPM_BUILD_ROOT/%{_libdir}/epiphany/%_epiphany_major_version/extensions/*.*a -rm $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins/*.*a -rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.*a -( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic ) +find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file seahorse-pgp-encrypted %suse_update_desktop_file seahorse-pgp-keys %suse_update_desktop_file seahorse-pgp-preferences Security X-SuSE-ControlCenter-Personal @@ -190,6 +189,7 @@ %{_libdir}/bonobo/servers/*.server %{_libdir}/seahorse/seahorse-applet %{_datadir}/omf/seahorse-applet +%if 0 %files epiphany %defattr (-, root, root) @@ -197,6 +197,7 @@ %dir %{_libdir}/epiphany/%_epiphany_major_version/extensions %{_libdir}/epiphany/%_epiphany_major_version/extensions/*.so %{_libdir}/epiphany/%_epiphany_major_version/extensions/seahorse.ephy-extension +%endif %files gedit %defattr (-, root, root) ++++++ seahorse-plugins-build-fix.patch ++++++ diff --git a/agent/seahorse-agent-prompt.c b/agent/seahorse-agent-prompt.c index a96a0d6..e897464 100644 --- a/agent/seahorse-agent-prompt.c +++ b/agent/seahorse-agent-prompt.c @@ -25,6 +25,8 @@ * Public License. */ +#include "config.h" + #include #include #include diff --git a/libseahorse/seahorse-gpg-options.c b/libseahorse/seahorse-gpg-options.c index c057ccd..32bcca7 100644 --- a/libseahorse/seahorse-gpg-options.c +++ b/libseahorse/seahorse-gpg-options.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include #include diff --git a/libseahorse/seahorse-gpgmex-op.c b/libseahorse/seahorse-gpgmex-op.c index fe9bf28..9e6bbce 100644 --- a/libseahorse/seahorse-gpgmex-op.c +++ b/libseahorse/seahorse-gpgmex-op.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include #include ++++++ seahorse-plugins-no-ephy.patch ++++++

From e0d33c440eb3ef9e588d25368e2f04ade915d6a8 Mon Sep 17 00:00:00 2001 From: Adam Schreiber Date: Wed, 20 May 2009 16:09:51 +0000 Subject: Change epiphany errors to echos

--- diff --git a/configure.in b/configure.in index 3fd0b91..a916c3f 100644 --- a/configure.in +++ b/configure.in @@ -336,7 +336,7 @@ else libxul-unstable) min_version=1.9 ;; xulrunner) min_version=1.8 ;; *firefox) min_version=1.5 ;; - *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;; + *) echo "Unsupported gecko $gecko_cv_gecko" ;; esac AC_MSG_CHECKING([for Epiphany API version]) @@ -348,7 +348,7 @@ done AC_MSG_RESULT([$epiphany_api_version]) if test -z "$epiphany_api_version"; then - AC_MSG_ERROR([epiphany not found]) + echo "epiphany not found" fi PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\ -- cgit v0.8.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org