[claws-mail-plugins] 3.7.10-2 pull gdata cvs version with upstreamed patch for authorizers in libgdata >= 0.9.x
Andreas Bierfert
awjb at fedoraproject.org
Sat Sep 24 18:00:23 UTC 2011
commit 4c28c5c1d4b98d3e82f8ea94e675c5b9e48f4cbf
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Sat Sep 24 20:00:06 2011 +0200
3.7.10-2
pull gdata cvs version with upstreamed patch for authorizers in
libgdata >= 0.9.x
.gitignore | 2 +
claws-mail-extra-plugins-3.7.9-libnotify07.patch | 49 --------
claws-mail-plugins-clam-socket.patch | 12 --
claws-mail-plugins-gdata-0.9.0.patch | 131 ++++++++++++++++++++++
claws-mail-plugins.spec | 123 ++++++++++++++++-----
sources | 3 +-
6 files changed, 229 insertions(+), 91 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fe6f12..3857a34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
claws-mail-extra-plugins-3.7.6.tar.bz2
/claws-mail-extra-plugins-3.7.8.tar.bz2
/claws-mail-extra-plugins-3.7.9.tar.bz2
+/claws-mail-extra-plugins-3.7.10.tar.bz2
+/gdata-0.2cvs11.tar.bz2
diff --git a/claws-mail-plugins-gdata-0.9.0.patch b/claws-mail-plugins-gdata-0.9.0.patch
new file mode 100644
index 0000000..5fa2bf8
--- /dev/null
+++ b/claws-mail-plugins-gdata-0.9.0.patch
@@ -0,0 +1,131 @@
+Index: configure.ac
+===================================================================
+RCS file: //plugins/gdata/Attic/configure.ac,v
+retrieving revision 1.1.2.19
+diff -u -r1.1.2.19 configure.ac
+--- configure.ac 3 Sep 2011 01:05:34 -0000 1.1.2.19
++++ configure.ac 11 Sep 2011 22:12:51 -0000
+@@ -102,10 +102,17 @@
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+
+ dnl Check for libgdata
+-PKG_CHECK_MODULES(GDATA, libgdata >= 0.6.4 libgdata < 0.9.0)
++PKG_CHECK_MODULES(GDATA, libgdata >= 0.6.4 libgdata < 0.10.0)
+ AC_SUBST(GDATA_CFLAGS)
+ AC_SUBST(GDATA_LIBS)
+
++dnl Check if libgdata includes the new authorizer api
++CFLAGS_SAVE="${CFLAGS}"
++CFLAGS="${GDATA_CFLAGS} ${CFLAGS}"
++AC_CHECK_HEADERS([gdata/gdata-authorizer.h],
++AC_DEFINE(HAVE_GDATA_GDATA_AUTHORIZER_H),,AC_INCLUDES_DEFAULT)
++CFLAGS="${CFLAGS_SAVE}"
++
+ AC_OUTPUT([
+ Makefile
+ config/Makefile
+Index: src/cm_gdata_contacts.c
+===================================================================
+RCS file: //plugins/gdata/src/Attic/cm_gdata_contacts.c,v
+retrieving revision 1.1.2.10
+diff -u -r1.1.2.10 cm_gdata_contacts.c
+--- src/cm_gdata_contacts.c 3 Sep 2011 01:05:34 -0000 1.1.2.10
++++ src/cm_gdata_contacts.c 11 Sep 2011 22:12:57 -0000
+@@ -198,6 +198,46 @@
+ log_message(LOG_PROTOCOL, _("GData plugin: Added %d of %d contacts to the cache\n"), num_contacts_added, num_contacts);
+ }
+
++static void query_after_auth(GDataContactsService *service)
++{
++ GDataContactsQuery *query;
++
++ log_message(LOG_PROTOCOL, _("GData plugin: Starting async contacts query\n"));
++
++ query = gdata_contacts_query_new(NULL);
++ gdata_query_set_max_results(GDATA_QUERY(query), cm_gdata_config.max_num_results);
++ gdata_contacts_service_query_contacts_async(service, GDATA_QUERY(query), NULL, NULL, NULL,
++#ifdef HAVE_GDATA_GDATA_AUTHORIZER_H
++ NULL,
++#endif
++ (GAsyncReadyCallback)cm_gdata_query_contacts_ready, NULL);
++
++ g_object_unref(query);
++}
++
++#ifdef HAVE_GDATA_GDATA_AUTHORIZER_H
++static void cm_gdata_auth_ready(GDataClientLoginAuthorizer *authorizer, GAsyncResult *res, gpointer data)
++{
++ GError *error = NULL;
++ GDataContactsService *service;
++
++ if(gdata_client_login_authorizer_authenticate_finish(authorizer, res, &error) == FALSE)
++ {
++ log_error(LOG_PROTOCOL, _("GData plugin: Authentification error: %s\n"), error->message);
++ g_error_free(error);
++ cm_gdata_contacts_query_running = FALSE;
++ return;
++ }
++
++ log_message(LOG_PROTOCOL, _("GData plugin: Authentificated\n"));
++
++ service = gdata_contacts_service_new(GDATA_AUTHORIZER(authorizer));
++
++ query_after_auth(service);
++
++ g_object_unref(service);
++}
++#else
+ static void cm_gdata_auth_ready(GDataContactsService *service, GAsyncResult *res, gpointer data)
+ {
+ GDataContactsQuery *query;
+@@ -213,17 +253,17 @@
+
+ log_message(LOG_PROTOCOL, _("GData plugin: Authentificated\n"));
+
+- log_message(LOG_PROTOCOL, _("GData plugin: Starting async contacts query\n"));
+- query = gdata_contacts_query_new(NULL);
+- gdata_query_set_max_results(GDATA_QUERY(query), cm_gdata_config.max_num_results);
+- gdata_contacts_service_query_contacts_async(service, GDATA_QUERY(query), NULL, NULL, NULL,
+- (GAsyncReadyCallback)cm_gdata_query_contacts_ready, NULL);
+- g_object_unref(query);
++ query_after_auth();
+ }
+-
++#endif
+ static void query()
+ {
++
++#ifdef HAVE_GDATA_GDATA_AUTHORIZER_H
++ GDataClientLoginAuthorizer *authorizer;
++#else
+ GDataContactsService *service;
++#endif
+
+ if(cm_gdata_contacts_query_running)
+ {
+@@ -232,11 +272,25 @@
+ }
+
+ log_message(LOG_PROTOCOL, _("GData plugin: Starting async authentification\n"));
++
++#ifdef HAVE_GDATA_GDATA_AUTHORIZER_H
++ authorizer = gdata_client_login_authorizer_new(CM_GDATA_CLIENT_ID, GDATA_TYPE_CONTACTS_SERVICE);
++ gdata_client_login_authorizer_authenticate_async(authorizer, cm_gdata_config.username, cm_gdata_config.password, NULL, (GAsyncReadyCallback)cm_gdata_auth_ready, NULL);
++ cm_gdata_contacts_query_running = TRUE;
++#else
+ service = gdata_contacts_service_new(CM_GDATA_CLIENT_ID);
+ cm_gdata_contacts_query_running = TRUE;
+ gdata_service_authenticate_async(GDATA_SERVICE(service), cm_gdata_config.username, cm_gdata_config.password, NULL,
+ (GAsyncReadyCallback)cm_gdata_auth_ready, NULL);
++#endif
++
++
++#ifdef HAVE_GDATA_GDATA_AUTHORIZER_H
++ g_object_unref(authorizer);
++#else
+ g_object_unref(service);
++#endif
++
+ }
+
+
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index 24b7699..82acabd 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -1,40 +1,39 @@
# define plugin version
%global acpinotifier 1.0.25
-%global addresskeeper 1.0.3
-%global archive 0.6.9
-%global attachwarner 0.2.21
+%global addresskeeper 1.0.4
+%global archive 0.6.10
+%global attachwarner 0.2.22
%global attremover 1.0.12
-%global bsfilter 1.0.5
-%global clamd 3.5.1
-%global fancy 0.9.13
+%global bsfilter 1.0.6
+%global clamd 3.5.2
+%global fancy 0.9.14
%global fetchinfo 0.4.24
-%global geolocation 0.0.5
-%global gtkhtml2viewer 0.30
+%global gdata 0.2cvs11
+%global geolocation 0.0.6
+%global gtkhtml2viewer 0.31
%global mailmbox 1.14.5
%global newmail 0.0.15
-%global notification 0.27
+%global notification 0.28
%global perl 0.9.18
-%global python 0.7
-%global rssyl 0.30
-%global spamreport 0.3.13
-%global tnef 0.3.10
-%global vcalendar 2.0.10
+%global python 0.8
+%global rssyl 0.31
+%global spamreport 0.3.14
+%global tnef 0.3.11
+%global vcalendar 2.0.11
Name: claws-mail-plugins
-Version: 3.7.9
-Release: 9%{?dist}
+Version: 3.7.10
+Release: 2%{?dist}
Summary: Additional plugins for claws-mail
Group: Applications/Internet
License: GPLv2 and GPLv3+ and MIT
URL: http://claws-mail.org
Source0: http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
+Source1: gdata-0.2cvs11.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: claws-mail-extra-plugins-3.7.9-libnotify07.patch
Patch1: claws-mail-plugins-geolocation-champlain-0.9.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=706322
-Patch2: claws-mail-plugins-clam-socket.patch
BuildRequires: claws-mail-devel >= %{version}
BuildRequires: glib2-devel
@@ -63,6 +62,11 @@ BuildRequires: libcanberra-devel
%if 0%{?fedora} >= 12
BuildRequires: libchamplain-gtk-devel
%endif
+%if !0%{?rhel}
+BuildRequires: libgdata-devel
+%endif
+BuildRequires: autoconf automake
+
Requires: %{name}-acpi-notifier = %{version}-%{release}
Requires: %{name}-address-keeper = %{version}-%{release}
Requires: %{name}-archive = %{version}-%{release}
@@ -72,6 +76,9 @@ Requires: %{name}-bsfilter = %{version}-%{release}
Requires: %{name}-clamd = %{version}-%{release}
Requires: %{name}-fancy = %{version}-%{release}
Requires: %{name}-fetchinfo = %{version}-%{release}
+%if !0%{?rhel}
+Requires: %{name}-gdata = %{version}-%{release}
+%endif
%if 0%{?fedora} >= 12
Requires: %{name}-geolocation = %{version}-%{release}
%endif
@@ -200,6 +207,19 @@ Obsoletes: sylpheed-claws-plugins-fetchinfo <= 2.6.0
This plugin inserts headers containing some download information:
UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
+%if !0%{?rhel}
+%package gdata
+Summary: Access to GData (Google services) for Claws Mail
+Group: Application/Internet
+Requires: claws-mail >= %{version}
+
+%description gdata
+Access to GData (Google services) for Claws Mail.
+
+The only currently implemented feature is inclusion of
+Google contacts into the address completion.
+%endif
+
%if 0%{?fedora} >= 12
%package geolocation
Summary: Provide GeoLocation functionality
@@ -332,19 +352,12 @@ exporting of your meetings or all your calendars.
%prep
%setup -q -n claws-mail-extra-plugins-%{version}
-# new libnotify
-%if 0%{?fedora} > 14
-pushd notification_plugin-%{notification}
-%patch0 -p2 -b .libnotify07
-popd
-%endif
-
# hack - Fedora 14 has libchamplain-gtk >= 0.6 and wouldn't even build
%if 0%{?fedora} == 14
sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.6!g' geolocation_plugin-%{geolocation}/configure
%endif
-%if 0%{?fedora} > 14
+%if 0%{?fedora} == 15
sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.10!g' geolocation_plugin-%{geolocation}/configure
sed -i -e 's!clutter-gtk-0.10!clutter-gtk-1.0!g' geolocation_plugin-%{geolocation}/configure
pushd geolocation_plugin-%{geolocation}
@@ -352,13 +365,23 @@ pushd geolocation_plugin-%{geolocation}
popd
%endif
-%patch2 -b .clam-socket
+%if 0%{?fedora} > 15
+sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.12!g' geolocation_plugin-%{geolocation}/configure
+sed -i -e 's!clutter-gtk-0.10!clutter-gtk-1.0!g' geolocation_plugin-%{geolocation}/configure
+pushd geolocation_plugin-%{geolocation}
+%patch1 -p2 -b .geolocation_champlain-0.10
+popd
+%endif
# fix perms
pushd vcalendar-%{vcalendar}
chmod 0644 COPYING README AUTHORS
popd
+# extract cvs version of gdata
+rm -fr gdata_plugin-0.2
+tar -xjvf %{SOURCE1}
+
%build
#acpi_notifier
cd acpi_notifier-%{acpinotifier}
@@ -405,6 +428,15 @@ cd ../fetchinfo-plugin-%{fetchinfo}
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags}
+# gdata
+%if !0%{?rhel}
+#cd ../gdata_plugin-%{gdata}
+cd ../gdata
+autoreconf -fi
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+%endif
+
%if 0%{?fedora} >= 12
#geolocation-plugin
cd ../geolocation_plugin-%{geolocation}
@@ -448,7 +480,6 @@ sed -i -e 's!PYTHON_VERSION}.so"!PYTHON_VERSION}.so.1.0"!' configure
%configure --disable-static --disable-dependency-tracking
%{__make} %{?_smp_mflags}
-
#rssyl
cd ../rssyl-%{rssyl}
%configure --disable-static --disable-dependency-tracking
@@ -527,6 +558,15 @@ cd fetchinfo-plugin-%{fetchinfo}
%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
cd -
+# gdata
+%if !0%{?rhel}
+cd gdata
+#cd gdata_plugin-%{gdata}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/
+cd -
+%find_lang gdata_plugin
+%endif
+
%if 0%{?fedora} >= 12
#geolocation-plugin
cd geolocation_plugin-%{geolocation}
@@ -691,6 +731,20 @@ rm -rf $RPM_BUILD_ROOT
%doc fetchinfo-plugin-%{fetchinfo}/README
%{_libdir}/claws-mail/plugins/fetchinfo*
+%if !0%{?rhel}
+%files gdata -f gdata_plugin.lang
+%defattr(-,root,root,-)
+#%doc gdata_plugin-%{gdata}/AUTHORS
+#%doc gdata_plugin-%{gdata}/ChangeLog
+#%doc gdata_plugin-%{gdata}/COPYING
+#%doc gdata_plugin-%{gdata}/README
+%doc gdata/AUTHORS
+%doc gdata/ChangeLog
+%doc gdata/COPYING
+%doc gdata/README
+%{_libdir}/claws-mail/plugins/gdata*
+%endif
+
%if 0%{?fedora} >= 12
%files geolocation -f geolocation_plugin.lang
%defattr(-,root,root,-)
@@ -785,6 +839,17 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/claws-mail/plugins/vcalendar/
%changelog
+* Thu Sep 22 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.10-2
+- pull gdata cvs version with upstreamed patch for authorizers in
+ libgdata >= 0.9.x
+
+* Tue Aug 30 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.10-1
+- version upgrade
+- add gdata plugin
+- remove upstreamed patches
+
* Thu Aug 04 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 3.7.9-9
- deprecate gtkhtml2 on f16 upwards
diff --git a/sources b/sources
index d81c1bb..15a9599 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-3d1ebc48f686ab10702380c776b5d5d0 claws-mail-extra-plugins-3.7.9.tar.bz2
+fe782b2d4762c9727e22c1bb7979f7d6 claws-mail-extra-plugins-3.7.10.tar.bz2
+d3d794962ef3d259d3400db6f116dd17 gdata-0.2cvs11.tar.bz2
More information about the scm-commits
mailing list