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

New version 3.8.1 (sync with Cooker)

Browse source
This commit is contained in:
Andrey Bondrov 2012-07-26 23:36:24 +11:00
parent a0e3457fa7
commit 05501d231e
5 changed files with 148 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.abf.yml
View file

@ -1,2 +1,3 @@
sources:
"claws-mail-3.7.9.tar.bz2": a5d5d93d5d6d6cabdbabd391724d7564a304449a
"claws-mail-3.8.1.tar.bz2": c519d07121bfb3095c7a3d47e53b6726bf397ed8

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);
}

18
claws-mail-3.7.9-bug2414.patch
View file

@ -1,18 +0,0 @@
Index: src/main.c
===================================================================
RCS file: //claws/src/main.c,v
retrieving revision 1.115.2.237
retrieving revision 1.115.2.238
diff -u -r1.115.2.237 -r1.115.2.238
--- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237
+++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238
@@ -331,7 +331,7 @@
gtk_widget_show(hack);
}
- xdisplay = gdk_display_get_default();
+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
sn_display = sn_display_new(xdisplay,
sn_error_trap_push,
sn_error_trap_pop);

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)

227
claws-mail.spec
View file

@ -1,74 +1,73 @@
%define pre %nil
%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
Summary: The user-friendly, lightweight and fast GTK2 based email client
Name: claws-mail
Version: 3.7.9
Release: %mkrel 2
Version: 3.8.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
Patch0: claws-mail-3.7.9-bug2414.patch
BuildRequires: gtk2-devel
# 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
BuildRequires: pkgconfig(enchant) >= 1.0.0
BuildRequires: pkgconfig(glib-2.0) >= 2.6
BuildRequires: pkgconfig(gmodule-2.0) >= 2.6
BuildRequires: pkgconfig(gnutls) >= 2.2
BuildRequires: pkgconfig(gobject-2.0) >= 2.6
BuildRequires: pkgconfig(gthread-2.0) >= 2.6
BuildRequires: pkgconfig(gtk+-2.0) >= 2.16
BuildRequires: pkgconfig(libgnome-2.0) >= 2.0
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.5
BuildRequires: pkgconfig(NetworkManager) >= 0.6.2
BuildRequires: docbook-utils
BuildRequires: libsm-devel
BuildRequires: openldap-devel
BuildRequires: enchant-devel
BuildRequires: libgdk_pixbuf2.0-devel >= 2.6.4
BuildRequires: pilot-link-devel
BuildRequires: libltdl-devel
BuildRequires: multiarch-utils
BuildRequires: libetpan-devel >= 0.42
BuildRequires: flex
BuildRequires: bison
BuildRequires: startup-notification-devel
BuildRequires: gnutls-devel
BuildRequires: valgrind
%if %mdkversion < 200700
BuildRequires: libgnomeprintui-devel
%endif
BuildRequires: valgrind-devel
BuildRequires: spamassassin-spamd >= 3.0.0
BuildRequires: libgcrypt-devel
BuildRequires: gpgme-devel > 0.4.5
BuildRequires: libsm-devel
%if %mdkversion > 200800
BuildRequires: imagemagick
%else
BuildRequires: imagemagick
%endif
%if %mdkversion > 200800
BuildRequires: compface-devel
Requires: compface
%endif
%if %mdkversion > 200700
BuildRequires: libdbus-glib-devel
%endif
%if %mdkversion > 2008100
Requires: rootcerts
%endif
#%if %mdkversion >= 200900
#BuildRequires: libnm_util-devel
#BuildRequires: libnm_glib-devel
#%endif
Requires: common-licenses
Requires: aspell-dictionary
Obsoletes: %{name}-tools
Obsoletes: %{name}-tools < %{EVRD}
Provides: %{name}-tools
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.
## BuildRequires: jconv
## Requires: jconv
Buildroot: %{_tmppath}/%{version_name}-%{release}-buildroot
%description
Claws-Mail is an e-mail client (and news reader) based on GTK+2, running
@ -114,19 +113,7 @@ For a complete listing of Features: http://www.claws-mail.org/features.php
Summary: Development files for %{name}
Group: Development/Other
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: gtk2-devel
Requires: openldap-devel
Requires: enchant-devel
Requires: aspell-dictionary
Requires: libgdk_pixbuf2.0-devel >= 2.6.4
Requires: pilot-link-devel
Requires: libltdl-devel
Requires: libetpan-devel >= 0.42
%if %mdkversion < 200700
Requires: libgnomeprintui-devel
%endif
Requires: gpgme-devel > 0.4.5
Requires: gnutls-devel
Obsoletes: sylpheed-claws2-devel
Obsoletes: sylpheed-claws-devel
@ -141,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}
@ -154,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}
@ -163,22 +148,21 @@ Group: %{Group}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: dillo
Provides: sylpheed-claws2-dillo_viewer-plugin
Obsoletes: 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}
Group: %{Group}
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: sylpheed-claws2-pgpcore-plugin
Obsoletes: 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}
@ -186,12 +170,11 @@ Group: %{Group}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-pgpcore-plugin = %{epoch}:%{version}-%{release}
Provides: sylpheed-claws2-pgpinline-plugin
Obsoletes: 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}
@ -199,12 +182,11 @@ Group: %{Group}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-pgpcore-plugin = %{epoch}:%{version}-%{release}
Provides: sylpheed-claws2-pgpmime-plugin
Obsoletes: 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}
@ -212,63 +194,52 @@ Group: %{Group}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: spamassassin-spamd
Provides: sylpheed-claws2-spamassassin-plugin
Obsoletes: 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}
Group: %{Group}
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: sylpheed-claws2-trayicon-plugin
Obsoletes: 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 -p0
%patch0 -p1
%patch1 -p0
%build
%define _disable_ld_no_undefined 1
%configure2_5x \
--enable-enchant \
--enable-jpilot \
--disable-openssl \
--enable-ldap \
--enable-gpgme \
--enable-crash-dialog \
--enable-spamassassin-plugin \
--enable-dillo-viewer-plugin \
--enable-trayicon-plugin \
--enable-bogofilter \
--enable-ipv6 \
%if %mdkversion > 200800
--enable-compface \
%endif
--enable-gnutls \
--disable-networkmanager-support \
--enable-networkmanager-support \
--disable-rpath \
--disable-static
%make
%make LIBTOOL=%{_bindir}/libtool
%check
make check
%install
rm -rf %{buildroot}
%makeinstall_std
# multiarch
@ -276,8 +247,6 @@ rm -rf %{buildroot}
##remove duplicate man#
rm -rf %{buildroot}%{_mandir}
## remove unneeded file
#rm -rf tools/Makefile*
## remove unneeded devel files
rm -f %{buildroot}%{_libdir}/%{name}/plugins/*.*a
@ -296,23 +265,7 @@ rm -f %{buildroot}%{_docdir}/claws-mail/tools/Makefile*
%find_lang %{name}
%if %mdkversion < 200900
%post
%{update_menus}
%update_icon_cache hicolor
%endif
%if %mdkversion < 200900
%postun
%{clean_menus}
%clean_icon_cache hicolor
%endif
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/%{name}
%{_bindir}/sylpheed-claws
%{_datadir}/applications/claws-mail.desktop
@ -322,52 +275,84 @@ rm -rf %{buildroot}
%{_docdir}/claws-mail
%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/pkgconfig/claws-mail.pc
%{multiarch_includedir}/%{name}/config.h
%files bogofilter-plugin
%defattr(-,root,root)
%{_libdir}/%{name}/plugins/bogofilter.so
%files smime-plugin
%defattr(-,root,root)
%{_libdir}/%{name}/plugins/smime.so
%{_libdir}/%{name}/plugins/smime.deps
%files dillo_viewer-plugin
%defattr(-,root,root)
%doc src/plugins/dillo_viewer/README
%{_libdir}/%{name}/plugins/dillo*.so
%files pgpcore-plugin
%defattr(-,root,root)
%{_libdir}/%{name}/plugins/pgpcore.so
%files pgpinline-plugin
%defattr(-,root,root)
%{_libdir}/%{name}/plugins/pgpinline.so
%{_libdir}/%{name}/plugins/pgpinline.deps
%files pgpmime-plugin
%defattr(-,root,root)
%{_libdir}/%{name}/plugins/pgpmime.so
%{_libdir}/%{name}/plugins/pgpmime.deps
%files spamassassin-plugin
%defattr(-,root,root)
%doc src/plugins/spamassassin/README
%{_libdir}/%{name}/plugins/spamassassin*.so
%files trayicon-plugin
%defattr(-,root,root)
%doc src/plugins/trayicon/README
%{_libdir}/%{name}/plugins/trayicon.so
%changelog
* Mon May 23 2011 Funda Wang <fwang@mandriva.org> 1:3.7.9-2mdv2011.0
* 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
- drop old stuff like from 2008
- enable networkmanager support
- update to new version 3.8.1
- spec file clean
* Sun Dec 18 2011 Andrey Bondrov <abondrov@mandriva.org> 1:3.8.0-1
+ Revision: 743401
- New version 3.8.0, minor spec cleanups
* Tue Nov 08 2011 Andrey Bondrov <abondrov@mandriva.org> 1:3.7.10-3
+ Revision: 729070
- Add patch0 to fix new glib issues
* Fri Sep 23 2011 Tomasz Pawel Gajc <tpg@mandriva.org> 1:3.7.10-2
+ Revision: 701085
- export libtool binary so it finally compiles
- drop unrecognized configure options
- add buildrequires on libtool and glib2-devel
- spec file clean
- add versioned obsoletes
- update to new version 3.7.10
- drop patch 0, not needed anymore
+ Matthew Dawkins <mattydaw@mandriva.org>
- oops
- cleaned up spec
rebuild for libetpan
removed devel reqs for devel pkg, not needed
* Mon May 23 2011 Funda Wang <fwang@mandriva.org> 1:3.7.9-2
+ Revision: 677607
- update multiarch usage
- add upstream patch to fix bug#2414
@ -522,7 +507,7 @@ rm -rf %{buildroot}
+ Revision: 164141
- Upgrade to 3.3.0
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
* Sun Dec 30 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 1:3.2.0-2mdv2008.1