commit 6003a694e84819156b6542bf73a569f514cbee98
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Jan 3 08:29:19 2013 +0100
- rel 1; disable geolocation plugin (as bcond) since it uses obsolete libs
versions
claws-mail-extra-plugins-geolocation.patch | 8 ++++----
claws-mail-extra-plugins.spec | 26 ++++++++++++++++----------
2 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/claws-mail-extra-plugins.spec b/claws-mail-extra-plugins.spec
index b3778a0..9c94ef8 100644
--- a/claws-mail-extra-plugins.spec
+++ b/claws-mail-extra-plugins.spec
@@ -1,31 +1,29 @@
#
-# TODO: make compatibility for clutter-gtk 1.0 (Th only)
+%bcond_with geolocation
#
-%if "%{pld_release}" != "th"
-%define _rel 3
-%else
-%define _rel 0.1
-%endif
+%define _rel 1
Summary: Plugins for Claws-Mail (metapackage)
Summary(pl.UTF-8): Wtyczki dla Claws-Mail (metapakiet)
Name: claws-mail-extra-plugins
-Version: 3.8.0
+Version: 3.9.0
Release: %{_rel}
License: GPL v3+
Group: Applications
Source0:
http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
-# Source0-md5: 4776f6e0357a694f384349ac73b6da52
+# Source0-md5: e82431243a6643bcc5520df78908240c
Patch0: %{name}-geolocation.patch
URL: http://www.claws-mail.org/plugins.php
-BuildRequires: claws-mail-devel >= 3.7.10.41
+%if %{with geolocation}
BuildRequires: clutter-gtk-devel >= 0.10.0
+BuildRequires: libchamplain-devel >= 0.8.0
+%endif
+BuildRequires: claws-mail-devel >= 3.7.10.41
BuildRequires: curl-devel
BuildRequires: gettext-devel
BuildRequires: gtk+2-devel >= 2:2.10.0
BuildRequires: gtk-webkit-devel
BuildRequires: libarchive-devel
BuildRequires: libcanberra-gtk-devel
-BuildRequires: libchamplain-devel >= 0.8.0
BuildRequires: libgdata-devel >= 0.6.4
BuildRequires: libgtkhtml-devel
BuildRequires: libnotify-devel >= 0.4.3
@@ -385,6 +383,10 @@ for i in `find -name id_ID.po -print`; do
%{__sed} -i -e 's,id_ID,id,g' $i/configure.ac
done
+%if ! %{with geolocation}
+rm -r geolocation*
+%endif
+
%build
for i in `find * -maxdepth 0 -type d -print`; do
cd "$i"
@@ -410,7 +412,9 @@ done
%find_lang bsfilter_plugin
%find_lang clamd
%find_lang fancy
+%if %{with geolocation}
%find_lang geolocation_plugin
+%endif
%find_lang gtkhtml2_viewer
%find_lang notification_plugin
%find_lang python_plugin
@@ -475,10 +479,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_plugins_dir}/gdata_plugin.so
+%if %{with geolocation}
%files -n claws-mail-plugin-geolocation -f geolocation_plugin.lang
%defattr(644,root,root,755)
%doc geolocation_plugin-*/{AUTHORS,ChangeLog,NEWS,README}
%attr(755,root,root) %{_plugins_dir}/geolocation_plugin.so
+%endif
%files -n claws-mail-plugin-gtkhtml2_viewer -f gtkhtml2_viewer.lang
%defattr(644,root,root,755)
diff --git a/claws-mail-extra-plugins-geolocation.patch
b/claws-mail-extra-plugins-geolocation.patch
index ad26bb7..a77b705 100644
--- a/claws-mail-extra-plugins-geolocation.patch
+++ b/claws-mail-extra-plugins-geolocation.patch
@@ -1,5 +1,5 @@
---- claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.7/configure.ac~
2011-12-16 12:20:45.000000000 +0100
-+++ claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.7/configure.ac
2012-01-02 12:51:12.947113060 +0100
+--- claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.8/configure.ac~
2011-12-16 12:20:45.000000000 +0100
++++ claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.8/configure.ac
2012-01-02 12:51:12.947113060 +0100
@@ -103,7 +103,9 @@
CHAMPLAIN_VERSION=0.6.0], [])
PKG_CHECK_EXISTS(champlain-gtk-0.8 > 0.8.0,[CHAMPLAIN_MODULE=champlain-gtk-0.8
@@ -11,8 +11,8 @@
AC_SUBST(VERSION)
AC_SUBST(PLUGINVERSION)
----
claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.7/src/geolocation_plugin.c~
2011-09-21 08:19:41.000000000 +0200
-+++
claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.7/src/geolocation_plugin.c
2012-01-02 12:59:59.397060657 +0100
+---
claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.8/src/geolocation_plugin.c~
2011-09-21 08:19:41.000000000 +0200
++++
claws-mail-extra-plugins-3.8.0/geolocation_plugin-0.0.8/src/geolocation_plugin.c
2012-01-02 12:59:59.397060657 +0100
@@ -276,7 +276,7 @@
/* create map widget */
map = gtk_champlain_embed_new();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/claws-mail-extra-plugins.git/commitdiff/6003a694e84819156b6542bf73a569f514cbee98
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
