Hello community,
here is the log from the commit of package claws-mail-extra-plugins for
openSUSE:Factory
checked in at Fri May 27 15:05:56 CEST 2011.
--------
--- claws-mail-extra-plugins/claws-mail-extra-plugins.changes 2011-04-27
09:20:22.000000000 +0200
+++
/mounts/work_src_done/STABLE/claws-mail-extra-plugins/claws-mail-extra-plugins.changes
2011-05-16 13:03:33.000000000 +0200
@@ -1,0 +2,11 @@
+Mon May 16 11:01:50 UTC 2011 - dims...@opensuse.org
+
+- Disable geolocation plugin on openSUSE > 11.4 for now:
+ + We have a too new libchamplain-gtk, which changed API. So far
+ it was sufficient to just change the 'detection' of champlain,
+ but with this version there are actually changes in the code
+ needed.
+- Make the changement of clutter-gtk and libchamplain more
+ automatic, to be able to support more than just 'one' version.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ claws-mail-extra-plugins.spec ++++++
--- /var/tmp/diff_new_pack.zS3L1b/_old 2011-05-27 15:05:18.000000000 +0200
+++ /var/tmp/diff_new_pack.zS3L1b/_new 2011-05-27 15:05:18.000000000 +0200
@@ -17,10 +17,17 @@
# norootforbuild
+# Thus we only build up to 11.4
+%if 0%{?suse_version} <= 1140
+%define build_geolocation 1
+%else
+%define build_geolocation 0
+%endif
Name: claws-mail-extra-plugins
Version: 3.7.9
-Release: 1
+Release: 2
+# NOTE: Try to enable geolocation plugin again. Last checked for 3.7.9 on 12.1.
Summary: Plugins for Claws Mail
License: GPLv2+
Group: Productivity/Networking/Email/Clients
@@ -94,8 +101,8 @@
%patch1 -p1
popd
%endif
-%if 0%{?suse_version} < 1140
-%__rm -r %{_builddir}/%{name}-%{version}/geolocation_plugin-0.0.4
+%if ! %{build_geolocation}
+%__rm -r %{_builddir}/%{name}-%{version}/geolocation_plugin-0.0.5
%endif
%build
@@ -103,11 +110,14 @@
pushd tnef_parse*
autoreconf -fiv
popd
-%if 0%{?suse_version} >= 1140
-# Patch geolocation plugin to build against libchamplain 0.7/0.8
+%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#champlain-gtk-0.8#g
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
@@ -143,7 +153,7 @@
%find_lang bsfilter_plugin plugins.lang
%find_lang clamd plugins.lang
%find_lang fancy plugins.lang
-%if 0%{?suse_version} >= 1140
+%if %{build_geolocation}
%find_lang geolocation_plugin plugins.lang
%endif
%find_lang gtkhtml2_viewer plugins.lang
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
