Djam/claws-mail
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/claws-mail.git synced 2025-02-23 07:12:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 3.8.1-3

Browse source
This commit is contained in:
Rosa 2012-08-07 15:57:45 +00:00
parent da0773372e
commit d80904f245
3 changed files with 85 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
claws-mail-3.7.6-trashed-read.patch Normal file
View file

@ -0,0 +1,16 @@
# Description: feature patch to mark as read mails moved to trash
# Author: Ricardo Mones <mones@debian.org>
diff -ur claws-mail-3.7.6.orig//src/summaryview.c claws-mail-3.7.6//src/summaryview.c
--- claws-mail-3.7.6.orig//src/summaryview.c 2010-02-19 09:10:55.000000000 +0100
+++ claws-mail-3.7.6//src/summaryview.c 2010-05-05 16:14:14.000000000 +0200
@@ -4449,6 +4449,10 @@
summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE);
}
if (!prefs_common.immediate_exec) {
+ if (to_folder->stype == F_TRASH
+ && MSG_IS_UNREAD(msginfo->flags)) {
+ summary_mark_row_as_read(summaryview, row);
+ }
summary_set_row_marks(summaryview, row);
}

25
claws-mail-3.8.1-fix-signature.patch Normal file
View file

@ -0,0 +1,25 @@
Gentoo bug : https://bugs.gentoo.org/show_bug.cgi?id=424882
Upstream bug : http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2689
Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.8.1cvs12
Claws Mail segfaults showing GPG/S-MIME signature info.
Index: src/plugins/pgpcore/sgpgme.c
===================================================================
RCS file: //claws/src/plugins/pgpcore/Attic/sgpgme.c,v
retrieving revision 1.1.2.71
retrieving revision 1.1.2.72
diff -u -r1.1.2.71 -r1.1.2.72
--- src/plugins/pgpcore/sgpgme.c 8 Jul 2012 12:48:47 -0000 1.1.2.71
+++ src/plugins/pgpcore/sgpgme.c 10 Jul 2012 14:10:11 -0000 1.1.2.72
@@ -327,7 +327,7 @@
j++;
user = user->next;
}
- g_string_append_printf(siginfo,
+ g_string_append(siginfo,
_("Primary key fingerprint:"));
const char* primary_fpr = NULL;
if (key && key->subkeys && key->subkeys->fpr)

77
claws-mail.spec
View file

@ -1,4 +1,9 @@
%define _disable_ld_no_undefined 1
# There are perl scripts in docs/tools and we don't want to install perl
# modules required by these scripts
%define __noautoreq 'perl(.*)'
%define version_name %{name}-%{version}
%define iconname %{name}.png
%define Group Networking/Mail
@ -6,12 +11,16 @@
Summary: The user-friendly, lightweight and fast GTK2 based email client
Name: claws-mail
Version: 3.8.1
Release: 1
Release: 3
Epoch: 1
License: GPLv3+
Group: %{Group}
URL: http://www.claws-mail.org
Source0: http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
# from Debian
Patch0: claws-mail-3.7.6-trashed-read.patch
# from upstream
Patch1: claws-mail-3.8.1-fix-signature.patch
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(dbus-1) >= 0.60
BuildRequires: pkgconfig(dbus-glib-1) >= 0.60
@ -44,16 +53,16 @@ Requires: compface
Requires: rootcerts
Requires: common-licenses
Requires: aspell-dictionary
Obsoletes: %{name}-tools < %{epoch}:%{version}-%{release}
Obsoletes: %{name}-tools < %{EVRD}
Provides: %{name}-tools
Obsoletes: %{name}-spamassassin-plugin < %{epoch}:%{version}-%{release}
Obsoletes: %{name}-spamassassin-plugin < %{EVRD}
# Fix upgrade from mdk 2006:
Obsoletes: sylpheed-claws2
Obsoletes: sylpheed-claws
#Clamav is dropped
Obsoletes: claws-mail-clamav-plugin
Obsoletes: claws-mail-clamav-plugin < %{EVRD}
#Pdf Viever is gone
Obsoletes: claws-mail-pdf_viewer-plugin
Obsoletes: claws-mail-pdf_viewer-plugin < %{EVRD}
## additinal feature which can be enabled at configure are jconv
## jconv
## A general purpose Japanese code conversion tool.
@ -119,12 +128,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bogofilter
%description bogofilter-plugin
Enables the scanning of incoming mail received from a
POP, IMAP, or LOCAL account using Bogofilter. It can
optionally delete mail identified as spam or save it
to a designated folder. Bogofilter is a pure Bayesian
filter, therefore it has better speed performance
than SpamAssassin but might catch less spam.
Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL
account using Bogofilter. It can optionally delete mail identified as spam
or save it to a designated folder. Bogofilter is a pure Bayesian filter,
therefore it has better speed performance than SpamAssassin but might catch
less spam.
%package smime-plugin
Summary: S/Mime plugin for %{name}
@ -132,8 +140,7 @@ Group: %{Group}
Requires: %{name} = %{epoch}:%{version}-%{release}
%description smime-plugin
This plugin allows to use S/Mime signatures and encryptions
in Claws Mail
This plugin allows to use S/Mime signatures and encryptions in Claws Mail.
%package dillo_viewer-plugin
Summary: Dillo HTML viewer plugin for %{name}
@ -144,8 +151,7 @@ Provides: sylpheed-claws2-dillo_viewer-plugin
Obsoletes: sylpheed-claws2-dillo_viewer-plugin < %{epoch}:%{version}-%{release}
%description dillo_viewer-plugin
This plugin uses the Dillo browser to view text/html
MIME parts inside %{name}.
This plugin uses the Dillo browser to view text/html MIME parts inside %{name}.
%package pgpcore-plugin
Summary: PGP core plugin for %{name}
@ -155,8 +161,8 @@ Provides: sylpheed-claws2-pgpcore-plugin
Obsoletes: sylpheed-claws2-pgpcore-plugin < %{epoch}:%{version}-%{release}
%description pgpcore-plugin
Handles core PGP functions and is a dependency of both
the PGP/Inline and PGP/MIME plugins.
Handles core PGP functions and is a dependency of both the PGP/Inline and
PGP/MIME plugins.
%package pgpinline-plugin
Summary: PGP/Inline plugin for %{name}
@ -167,9 +173,8 @@ Provides: sylpheed-claws2-pgpinline-plugin
Obsoletes: sylpheed-claws2-pgpinline-plugin < %{epoch}:%{version}-%{release}
%description pgpinline-plugin
Handles PGP/Inline signed and/or encrypted mails.
You can decrypt mails, verify signatures or sign
and encrypt your own mails.
Handles PGP/Inline signed and/or encrypted mails. You can decrypt mails,
verify signatures or sign and encrypt your own mails.
%package pgpmime-plugin
Summary: PGP/MIME plugin for %{name}
@ -180,9 +185,8 @@ Provides: sylpheed-claws2-pgpmime-plugin
Obsoletes: sylpheed-claws2-pgpmime-plugin < %{epoch}:%{version}-%{release}
%description pgpmime-plugin
Handles PGP/MIME signed and/or encrypted mails.
You can decrypt mails, verify signatures or sign
and encrypt your own mails.
Handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify
signatures or sign and encrypt your own mails.
%package spamassassin-plugin
Summary: Spamassassin-plugin for %{name}
@ -193,10 +197,8 @@ Provides: sylpheed-claws2-spamassassin-plugin
Obsoletes: sylpheed-claws2-spamassassin-plugin < %{epoch}:%{version}-%{release}
%description spamassassin-plugin
Enables the scanning of incoming mail received from a
POP, IMAP, or LOCAL account using SpamAssassin
See README for configuration and set-up info.
Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL
account using SpamAssassin. See README for configuration and set-up info.
%package trayicon-plugin
Summary: Notafication icon for %{name}
@ -206,15 +208,15 @@ Provides: sylpheed-claws2-trayicon-plugin
Obsoletes: sylpheed-claws2-trayicon-plugin < %{epoch}:%{version}-%{release}
%description trayicon-plugin
Places an icon in the system tray that indicates
whether you have any new mail. A tooltip also shows
the current new, unread and total number of messages,
and a contextual menu allows the most common operations.
See README for additional info.
Places an icon in the system tray that indicates whether you have any new mail.
A tooltip also shows the current new, unread and total number of messages, and
a contextual menu allows the most common operations. See README for additional
info.
%prep
%setup -q
%patch0 -p1
%patch1 -p0
%build
%configure2_5x \
@ -309,6 +311,15 @@ rm -f %{buildroot}%{_docdir}/claws-mail/tools/Makefile*
%changelog
* Thu Jul 19 2012 Andrey Bondrov <abondrov@mandriva.org> 1:3.8.1-3
+ Revision: 810153
- Forgot to increase release
- Add patch from upstream to fix segfault, add patch from Debian to mark trashed mail as read, re-format descriptions
* Wed Jul 18 2012 Andrey Bondrov <abondrov@mandriva.org> 1:3.8.1-2
+ Revision: 810130
- Add requires exceptions and fix unversioned obsoletes issue
* Wed Jul 11 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 1:3.8.1-1
+ Revision: 808936
- convert buildrequires to pkg-config style