Hello community,
here is the log from the commit of package claws-mail-extra-plugins for
openSUSE:Factory
checked in at Fri Sep 9 11:10:31 CEST 2011.
--------
--- claws-mail-extra-plugins/claws-mail-extra-plugins.changes 2011-05-16
13:03:33.000000000 +0200
+++
/mounts/work_src_done/STABLE/claws-mail-extra-plugins/claws-mail-extra-plugins.changes
2011-09-05 15:31:14.000000000 +0200
@@ -1,0 +2,43 @@
+Mon Sep 5 07:58:56 UTC 2011 - vu...@opensuse.org
+
+- Update to version 3.7.10:
+ + Fancy:
+ - Show a message when navigation is blocked by preferences.
+ - Add configurable proxy support.
+ - Add option to enable/disable java applets.
+ - Code cleanups.
+ + GData:
+ - New plugin that provides access to the GData protocol.
+ - Currently, the only implemented functionality is to include
+ Google Contacts into the Tab-address completion.
+ + GeoLocation:
+ - Add support for libchamplain 0.6 and 0.8.
+ - Check for initialization errors in clutter-gtk.
+ + gtkhtml2_viewer:
+ - Do not ignore message encoding.
+ - Code cleanups.
+ + notification:
+ - Add support for libnotify >= 0.7.
+ - Add support libindicate 0.5.
+ - Set attention hint whenever new messages are present.
+ - Code cleanups.
+ + RSSyl:
+ - Fix usage of isspace().
+ - Code cleanups.
+ + vcalendar:
+ - Fix segfault when parsing of event XML fails.
+ - Code cleanups.
+ + Updated translations.
+- Add pkgconfig(libgdata) BuildRequires for the new GData plugin,
+ and enable the build of the plugin on 11.4 only (with a
+ build_gdata macro), as the libgdata version in Factory is too
+ recent (and glib2 is too old on 11.3).
+- Update claws-mail-extra-plugins-fancy-build.patch: this was fixed
+ upstream, except that the fix won't work for 11.4, so tweak the
+ patch appropriately.
+- Move hack to patch the geolocation plugin to support later
+ versions of libchamplain from %build to %prep, and adapt it after
+ changes upstream: only small bits are needed for 11.3 and 11.4
+ now.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
claws-mail-extra-plugins-3.7.9.tar.bz2
New:
----
claws-mail-extra-plugins-3.7.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ claws-mail-extra-plugins.spec ++++++
--- /var/tmp/diff_new_pack.E0QSGt/_old 2011-09-09 11:10:22.000000000 +0200
+++ /var/tmp/diff_new_pack.E0QSGt/_new 2011-09-09 11:10:22.000000000 +0200
@@ -15,26 +15,31 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-# Thus we only build up to 11.4
%if 0%{?suse_version} <= 1140
%define build_geolocation 1
%else
%define build_geolocation 0
%endif
+# The right combination of libraries is only in 11.4 for now
+%if 0%{?suse_version} == 1140
+%define build_gdata 1
+%else
+%define build_gdata 0
+%endif
+
Name: claws-mail-extra-plugins
-Version: 3.7.9
-Release: 2
-# NOTE: Try to enable geolocation plugin again. Last checked for 3.7.9 on 12.1.
+Version: 3.7.10
+Release: 1
+# NOTE: Try to enable gdata and geolocation plugins again. Last checked for
3.7.10 on 12.1.
Summary: Plugins for Claws Mail
License: GPLv2+
Group: Productivity/Networking/Email/Clients
Url: http://claws-mail.org
-Source0:
http://prdownloads.sourceforge.net/claws-mail/claws-mail-extra-plugins-%{version}.tar.bz2
+Source0:
http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/3.7.10/%{name}-%{version}.tar.bz2
Patch0: claws-mail-extra-plugins-libytnef_shlib.patch
-# PATCH-FIX-UPSTREAM claws-mail-extra-plugins-fancy-build.patch -- Fix build
with latest webkit by adding missing include.
+# PATCH-FIX-OPENSUSE claws-mail-extra-plugins-fancy-build.patch -- Fix build
of fancy plugin on 11.4
Patch1: claws-mail-extra-plugins-fancy-build.patch
BuildRequires: claws-mail-devel >= 3.7.2
BuildRequires: db-devel
@@ -53,6 +58,10 @@
BuildRequires: perl >= 5.8
BuildRequires: pkgconfig
BuildRequires: python-gtk-devel
+%if %{build_gdata}
+BuildRequires: pkgconfig(libgdata) >= 0.6.4
+BuildRequires: pkgconfig(libgdata) < 0.9.0
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: perl = %{perl_version}
Requires: %{name}-lang = %{version}
@@ -96,13 +105,24 @@
pushd tnef_parse*
%patch0 -p2
popd
-%if 0%{?suse_version} > 1130
+%if 0%{?suse_version} == 1140
pushd fancy-*
-%patch1 -p1
+%patch1 -p0
popd
+# Patch geolocation plugin to accept libchamplain 0.8.0
+grep -q "champlain-gtk-0.8 > 0.8.0" geolocation_plugin-0.0.6/configure
+sed -i "s:champlain-gtk-0.8 > 0.8.0:champlain-gtk-0.8 >= 0.8.0:g"
geolocation_plugin-0.0.6/configure
+%endif
+%if 0%{?suse_version} == 1130
+# Patch geolocation plugin to accept weird version of clutter-gtk in 11.3
+clutterpc=$(basename $(rpm -ql clutter-gtk-devel | grep clutter-gtk.*.pc | sed
s/\.pc//))
+sed -i "s:clutter-gtk-0.10:$clutterpc:g" geolocation_plugin-0.0.6/configure
%endif
%if ! %{build_geolocation}
-%__rm -r %{_builddir}/%{name}-%{version}/geolocation_plugin-0.0.5
+rm -r %{_builddir}/%{name}-%{version}/geolocation_plugin-0.0.6
+%endif
+%if ! %{build_gdata}
+rm -r %{_builddir}/%{name}-%{version}/gdata_plugin-0.2
%endif
%build
@@ -110,16 +130,6 @@
pushd tnef_parse*
autoreconf -fiv
popd
-%if %{build_geolocation}
-# Patch geolocation plugin to detect installed version of libchamplain and
clutter-gtk
-# fail if we can't do this anymore.
-champpc=$(basename $(rpm -ql libchamplain-devel | grep champlain-gtk.*.pc |
sed s/\.pc//))
-clutterpc=$(basename $(rpm -ql clutter-gtk-devel | grep clutter-gtk.*.pc | sed
s/\.pc//))
-grep champlain-gtk-0.4 geolocation_plugin-0.0.5/configure && \
- sed -i s#champlain-gtk-0.4#$champpc#g geolocation_plugin-0.0.5/configure && \
- sed -i s#clutter-gtk-0.10#$clutterpc#g geolocation_plugin-0.0.5/configure ||
\
- ( echo "Drop the champlain hack from the .spec file"; /bin/false)
-%endif
# build all plugins
# each plugin has its own src-dir
for i in $(find -maxdepth 1 -type d -not -name .)
++++++ claws-mail-extra-plugins-3.7.9.tar.bz2 ->
claws-mail-extra-plugins-3.7.10.tar.bz2 ++++++
claws-mail-extra-plugins/claws-mail-extra-plugins-3.7.9.tar.bz2
/mounts/work_src_done/STABLE/claws-mail-extra-plugins/claws-mail-extra-plugins-3.7.10.tar.bz2
differ: char 11, line 1
++++++ claws-mail-extra-plugins-fancy-build.patch ++++++
--- /var/tmp/diff_new_pack.E0QSGt/_old 2011-09-09 11:10:23.000000000 +0200
+++ /var/tmp/diff_new_pack.E0QSGt/_new 2011-09-09 11:10:23.000000000 +0200
@@ -1,10 +1,13 @@
---- fancy-0.9.12/src/fancy_viewer.h
-+++ fancy-0.9.12/src/fancy_viewer.h
-@@ -33,6 +33,7 @@
+Index: src/fancy_viewer.h
+===================================================================
+--- src/fancy_viewer.h
++++ src/fancy_viewer.h
+@@ -33,7 +33,7 @@
#include <webkit/webkitversion.h>
#include <webkit/webkitwebframe.h>
#include <webkit/webkitnetworkrequest.h>
-+#include <webkit/webkitglobals.h>
+-#if WEBKIT_CHECK_VERSION (1,3,13)
++#if WEBKIT_CHECK_VERSION (1,3,10)
+ #include <webkit/webkitglobals.h>
+ #endif
#include <prefs_common.h>
- #include "common/claws.h"
- #include "common/version.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
