X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=claws-mail.spec;h=603d5213f31afae185f5dba19e26e971d55b6577;hb=f642029;hp=47d0375e0e7af389c7ca81ab997dfd9c09d8ae0e;hpb=1199c73d82899fd416532c8c46d3125dddd45e13;p=packages%2Fclaws-mail.git

diff --git a/claws-mail.spec b/claws-mail.spec
index 47d0375..603d521 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -1,52 +1,86 @@
 #
 # Conditional build:
-%bcond_without	clamav		# build without clamav plugin
 %bcond_without	compface	# build without compface support
-%bcond_without	gnomeprint	# build without gnomeprint support
 %bcond_without	gpg		# build without GPG support
 %bcond_without	ipv6		# build without IPv6 support
 %bcond_without	jpilot		# build without JPilot support
 %bcond_without	ldap		# build without LDAP support
-%bcond_without	ssl		# build without SSL support
-#
+%bcond_without	tls		# build without gnuTLS support
+
 Summary:	A bleeding edge branch of Sylpheed, a GTK2 based, lightweight, and fast e-mail client
-Summary(pl):	Rozwojowa wersja Sylpheed z du¿± ilo¶ci± zmian oraz ulepszeñ
+Summary(pl.UTF-8):	Rozwojowa wersja Sylpheed z dużą ilością zmian oraz ulepszeń
 Name:		claws-mail
-Version:	2.6.1
-Release:	2
-License:	GPL v2
-Group:		X11/Applications/Networking
-Source0:	http://dl.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
-# Source0-md5:	98099550a68a08eca5354659f3ea465c
+Version:	3.15.1
+Release:	1
+License:	GPL v3+
+Group:		X11/Applications/Mail
+Source0:	http://www.claws-mail.org/download.php?file=releases/%{name}-%{version}.tar.xz
+# Source0-md5:	d4efd5723742155207c31ff2682d7f8c
 Source1:	%{name}.desktop
-URL:		http://www.claws-mail.net/
-BuildRequires:	aspell-devel >= 2:0.50
+Patch0:		%{name}-build.patch
+URL:		http://www.claws-mail.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
-%{?with_clamav:BuildRequires:	clamav-devel}
 %{?with_compface:BuildRequires:	compface-devel}
-BuildRequires:	gdk-pixbuf-devel >= 0.8
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	gmp-devel
+%{?with_tls:BuildRequires:	gnutls-devel >= 2.6.0}
 %{?with_gpg:BuildRequires:	gpgme-devel >= 1:0.4.5}
-BuildRequires:	gtk+2-devel >= 2:2.6.0
-BuildRequires:	imlib-devel >= 1.9
-BuildRequires:	libetpan-devel >= 0.48
-%{?with_gnomeprint:BuildRequires:	libgnomeprintui-devel}
+BuildRequires:	gtk+2-devel >= 2:2.24.0
+BuildRequires:	gtk-webkit-devel
+BuildRequires:	libarchive-devel
+BuildRequires:	libcanberra-gtk-devel
+BuildRequires:	libetpan-devel >= 0.57
+BuildRequires:	libgdata-devel >= 0.17.2
+BuildRequires:	libical-devel >= 2.0.0
+BuildRequires:	libindicate-devel >= 0.12.0
+BuildRequires:	liblockfile-devel
 BuildRequires:	libltdl-devel
+BuildRequires:	libnotify-devel >= 0.4.3
+BuildRequires:	librsvg-devel >= 2.40.5
 BuildRequires:	libtool
+BuildRequires:	libxml2-devel
+BuildRequires:	libytnef-devel
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
-%{?with_jpilot:BuildRequires:	pilot-link-devel}
+%if %{with jpilot}
+BuildRequires:	bluez-libs-devel
+BuildRequires:	pilot-link-devel
+%endif
+BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
+BuildRequires:	poppler-glib-devel
+BuildRequires:	python-devel
+BuildRequires:	python-pygtk-devel
 BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.5
-Requires(post,postun):	gtk+2
+Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
+Requires:	gtk+2 >= 2:2.24.0
 Provides:	sylpheed-claws
-Obsoletes:	sylpheed
+Obsoletes:	claws-mail-plugin-acpi_notifier
+Obsoletes:	claws-mail-plugin-address_keeper
+Obsoletes:	claws-mail-plugin-att_remover
+Obsoletes:	claws-mail-plugin-attachwarner
+Obsoletes:	claws-mail-plugin-bogofilter
+Obsoletes:	claws-mail-plugin-bsfilter
+Obsoletes:	claws-mail-plugin-cachesaver <= 3.7.6-5
+Obsoletes:	claws-mail-plugin-clamav
+Obsoletes:	claws-mail-plugin-clamd
+Obsoletes:	claws-mail-plugin-dillo <= 3.9.0
+Obsoletes:	claws-mail-plugin-etpan-privacy
+Obsoletes:	claws-mail-plugin-fetchinfo
+Obsoletes:	claws-mail-plugin-gtkhtml2_viewer <= 3.9.0
+Obsoletes:	claws-mail-plugin-maildir
+Obsoletes:	claws-mail-plugin-mailmbox
+Obsoletes:	claws-mail-plugin-newmail
+Obsoletes:	claws-mail-plugin-spamassassin
+Obsoletes:	claws-mail-plugin-synce <= 3.7.6-5
+Obsoletes:	claws-mail-plugin-tnef_parse
+Obsoletes:	claws-mail-plugin-trayicon <= 3.9.0
 Obsoletes:	sylpheed-claws
+Obsoletes:	sylpheed-claws-plugin-clamav
 Obsoletes:	sylpheed-gtk2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,115 +89,66 @@ This program is an X based fast e-mail client which has features same
 as orginal Sylpheed but with new/improved features. Some of new stuff
 is really cool and useable.
 
-%description -l pl
-Szybki klient poczty o mo¿liwo¶ciach takich jak oryginalny Sylpheed
-ale z nowymi/poprawionymi funkcjami. Niektóre dodatki s± naprawdê
-¶wietne i u¿yteczne.
+%description -l pl.UTF-8
+Szybki klient poczty o możliwościach takich jak oryginalny Sylpheed
+ale z nowymi/poprawionymi funkcjami. Niektóre dodatki są naprawdę
+świetne i użyteczne.
 
 %package devel
 Summary:	Headers from Claws-Mail
-Summary(pl):	Pliki nag³ówkowe programu Claws-Mail
-Group:		X11/Applications/Networking
+Summary(pl.UTF-8):	Pliki nagłówkowe programu Claws-Mail
+Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	gnutls-devel >= 2.6.0
 Requires:	gpgme-devel >= 1:0.4.5
-Requires:	libetpan-devel >= 0.48
-Requires:	openssl-devel >= 0.9.7d
+Requires:	libetpan-devel >= 0.54
 Provides:	sylpheed-claws-devel
 Obsoletes:	sylpheed-claws-devel
 
 %description devel
 Claws-Mail development package.
 
-%description devel -l pl
-Pliki nag³ówkowe programu Claws-Mail.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe programu Claws-Mail.
 
 %package plugins
 Summary:	Special plugins for Claws-Mail (metapackage)
-Summary(pl):	Dodatkowe wtyczki dla Claws-Mail (metapakiet)
-Group:		X11/Applications/Networking
+Summary(pl.UTF-8):	Dodatkowe wtyczki dla Claws-Mail (metapakiet)
+Group:		X11/Applications/Mail
 Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-plugin-bogofilter = %{version}-%{release}
-%{?with_clamav:Requires:	%{name}-plugin-clamav = %{version}-%{release}}
-Requires:	%{name}-plugin-dillo = %{version}-%{release}
+Requires:	%{name}-plugin-libravatar = %{version}-%{release}
 %if %{with gpg}
 Requires:	%{name}-plugin-pgpinline = %{version}-%{release}
 Requires:	%{name}-plugin-pgpmime = %{version}-%{release}
 %endif
-Requires:	%{name}-plugin-spamassassin = %{version}-%{release}
-Requires:	%{name}-plugin-trayicon = %{version}-%{release}
-Provides:	sylpheed-claws-plugins
+Requires:	%{name}-plugin-archive = %{version}-%{release}
+Requires:	%{name}-plugin-fancy = %{version}-%{release}
+Requires:	%{name}-plugin-gdata = %{version}-%{release}
+Requires:	%{name}-plugin-notification = %{version}-%{release}
+Requires:	%{name}-plugin-perl = %{version}-%{release}
+Requires:	%{name}-plugin-rssyl = %{version}-%{release}
+Requires:	%{name}-plugin-smime = %{version}-%{release}
+Requires:	%{name}-plugin-spamreport = %{version}-%{release}
+Requires:	%{name}-plugin-vcalendar = %{version}-%{release}
+Provides:	sylpheed-claws-extra-plugins
+Provides:	sylpheed-claws-plugins = %{version}
+Obsoletes:	claws-mail-extra-plugins <= 3.9.0
+Obsoletes:	sylpheed-claws-extra-plugins
+Obsoletes:	sylpheed-claws-plugin-others
 Obsoletes:	sylpheed-claws-plugins
 
 %description plugins
 This is collection of some usefull plugins for Claws-Mail
 (metapackage).
 
-%description plugins -l pl
-Jest to zbiór kilku dodatkowych wtyczek powiêkszaj±cych mo¿liwo¶ci
+%description plugins -l pl.UTF-8
+Jest to zbiór kilku dodatkowych wtyczek powiększających możliwości
 Claws-Mail (metapakiet).
 
-%package plugin-bogofilter
-Summary:	Bogofilter plugin for Claws-Mail
-Summary(pl):	Wtyczka bogofilter dla Claws-Mail
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-Requires:	bogofilter
-Provides:	sylpheed-claws-plugin-bogofilter
-Obsoletes:	sylpheed-claws-plugin-bogofilter
-
-%description plugin-bogofilter
-This 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.
-
-%description plugin-bogofilter -l pl
-Wtyczka pozwalaj±ca na skanowanie bogofilterem poczty przychodz±cej
-jak i ju¿ znajduj±cej siê w lokalnych skrzynkach. Opcjonalnie mo¿e
-usuwaæ listy oznaczone jako spam lub zapisywaæ je w dedykowanym
-folderze.
-
-%package plugin-clamav
-Summary:	clamav plugin for Claws-Mail
-Summary(pl):	Wtyczka clamav dla Claws-Mail
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-Provides:	sylpheed-claws-plugin-clamav
-Obsoletes:	sylpheed-claws-plugin-clamav
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
-
-%description plugin-clamav
-This plugin enables the scanning of message attachments in mail
-received from a POP, IMAP, or LOCAL account using Clam AntiVirus. It
-can optionally delete the mail or save it to a designated folder.
-
-%description plugin-clamav -l pl
-Ta wtyczka pozwala na lokalne skanowanie za³±czników z poczty
-otrzymanej przez POP, IMAP lub znajduj±cej siê w lokalnych skrzynkach.
-Opcjonalnie mo¿e usuwaæ lub zapisywaæ zainfekowane listy w
-przeznaczonym do tego folderze.
-
-%package plugin-dillo
-Summary:	dillo plugin for Claws-Mail
-Summary(pl):	Wtyczka dillo dla Claws-Mail
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-Requires:	dillo
-Provides:	sylpheed-claws-plugin-dillo
-Obsoletes:	sylpheed-claws-plugin-dillo
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
-
-%description plugin-dillo
-This plugin enables the viewing of html messages using the Dillo web
-browser.
-
-%description plugin-dillo -l pl
-Wtyczka pozwalaj±ca na przegl±danie listów pisanych w HTML przy pomocy
-przegl±darki Dillo.
-
 %package plugin-pgpcore
 Summary:	PGP/Core plugin for Claws-Mail
-Summary(pl):	Wtyczka PGP/Core dla Claws-Mail
-Group:		X11/Applications/Networking
+Summary(pl.UTF-8):	Wtyczka PGP/Core dla Claws-Mail
+Group:		X11/Applications/Mail
 Requires:	%{name} = %{version}-%{release}
 Provides:	sylpheed-claws-plugin-pgpcore
 Obsoletes:	sylpheed-claws-plugin-pgpcore
@@ -172,13 +157,13 @@ Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 %description plugin-pgpcore
 This plugin handles core PGP functions.
 
-%description plugin-pgpcore -l pl
-Wtyczka obs³uguj±ca podstawowe funkcje PGP.
+%description plugin-pgpcore -l pl.UTF-8
+Wtyczka obsługująca podstawowe funkcje PGP.
 
 %package plugin-pgpinline
 Summary:	PGP/Inline plugin for Claws-Mail
-Summary(pl):	Wtyczka PGP/Inline dla Claws-Mail
-Group:		X11/Applications/Networking
+Summary(pl.UTF-8):	Wtyczka PGP/Inline dla Claws-Mail
+Group:		X11/Applications/Mail
 Requires:	%{name}-plugin-pgpcore = %{version}-%{release}
 Provides:	sylpheed-claws-plugin-pgpinline
 Obsoletes:	sylpheed-claws-plugin-pgpinline
@@ -188,15 +173,15 @@ Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 This plugin handles PGP/Inline signed and/or encrypted mails. It can
 decrypt mails, verify signatures or sign and encrypt your own mails.
 
-%description plugin-pgpinline -l pl
-Wtyczka obs³uguj±ca listy podpisane lub szyfrowane PGP/Inline. Potrafi
-rozszyfrowywaæ, sprawdzaæ podpisy a tak¿e szyfrowaæ i podpisywaæ
-w³asne listy.
+%description plugin-pgpinline -l pl.UTF-8
+Wtyczka obsługująca listy podpisane lub szyfrowane PGP/Inline. Potrafi
+rozszyfrowywać, sprawdzać podpisy a także szyfrować i podpisywać
+własne listy.
 
 %package plugin-pgpmime
 Summary:	PGP/MIME plugin for Claws-Mail
-Summary(pl):	Wtyczka PGP/MIME dla Claws-Mail
-Group:		X11/Applications/Networking
+Summary(pl.UTF-8):	Wtyczka PGP/MIME dla Claws-Mail
+Group:		X11/Applications/Mail
 Requires:	%{name}-plugin-pgpcore = %{version}-%{release}
 Provides:	sylpheed-claws-plugin-pgpmime
 Obsoletes:	sylpheed-claws-plugin-pgpmime
@@ -206,58 +191,189 @@ Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
 This plugin handles PGP/MIME signed and/or encrypted mails. It can
 decrypt mails, verify signatures or sign and encrypt your own mails.
 
-%description plugin-pgpmime -l pl
-Wtyczka obs³uguj±ca listy podpisane lub szyfrowane PGP/MIME. Potrafi
-rozszyfrowywaæ, sprawdzaæ podpisy a tak¿e szyfrowaæ i podpisywaæ
-w³asne listy.
+%description plugin-pgpmime -l pl.UTF-8
+Wtyczka obsługująca listy podpisane lub szyfrowane PGP/MIME. Potrafi
+rozszyfrowywać, sprawdzać podpisy a także szyfrować i podpisywać
+własne listy.
 
-%package plugin-spamassassin
-Summary:	spamassassin plugin for Claws-Mail
-Summary(pl):	Wtyczka spamassassin dla Claws-Mail
-Group:		X11/Applications/Networking
+%package plugin-smime
+Summary:	S/MIME plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka S/MIME dla Claws-Mail
+Group:		X11/Applications/Mail
 Requires:	%{name} = %{version}-%{release}
-Provides:	sylpheed-claws-plugin-spamassassin
-Obsoletes:	sylpheed-claws-plugin-spamassassin
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
+Requires:	%{name}-plugin-pgpcore = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-smime
+Obsoletes:	sylpheed-claws-plugin-smime
+
+%description plugin-smime
+This plugin handles S/MIME signed and/or encrypted mails. You can
+decrypt mails, verify signatures or sign and encrypt your own mails.
+
+%description plugin-smime -l pl.UTF-8
+Wtyczka obsługująca listy podpisane lub szyfrowane S/MIME. Potrafi
+rozszyfrowywać, sprawdzać podpisy a także szyfrować i podpisywać
+własne listy.
+
+%package plugin-archive
+Summary:	archive plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka archive dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-archive
+This plugin lets you archive IMAP, LOCAL and POP accounts as well as
+calendar accounts.
+
+%description plugin-archive -l pl.UTF-8
+Ta wtyczka pozwala archiwizować konta IMAP, LOCAL i POP jak również
+kalendarze.
+
+%package plugin-fancy
+Summary:	fancy plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka fancy dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-fancy
+Renders HTML e-mail using the WebKit library.
+
+%description plugin-fancy -l pl.UTF-8
+Ta wtyczka przetwarza wiadomości w formacie HTML przy użyciu
+biblioteki WebKit.
 
-%description plugin-spamassassin
-This plugin enables the scanning of incoming mail received from a POP,
-IMAP, or LOCAL account using SpamAssassin. It can optionally delete
-mail identified as spam or save it to a designated folder, and also
-can be used to train a local Spamassassin or a remote one.
-
-%description plugin-spamassassin -l pl
-Wtyczka pozwalaj±ca na skanowanie SpamAssassinem poczty przychodz±cej
-jak i ju¿ znajduj±cej siê w lokalnych skrzynkach. Opcjonalnie mo¿e
-usuwaæ listy oznaczone jako spam lub zapisywaæ je w dedykowanym
-folderze. Mo¿e te¿ by¿ u¿ywana do "uczenia" lokalnego lub zdalnego
-demona SpamAssassin.
-
-%package plugin-trayicon
-Summary:	trayicon plugin for Claws-Mail
-Summary(pl):	Wtyczka trayicon dla Claws-Mail
+%package plugin-gdata
+Summary:	gdata plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka gdata dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-gdata
+gdata plugin for Claws-Mail.
+
+%description plugin-gdata -l pl.UTF-8
+Wtyczka gdata dla Claws-Mail.
+
+%package plugin-notification
+Summary:	notification plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka notification dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-notification
+Obsoletes:	sylpheed-claws-plugin-notification
+
+%description plugin-notification
+This plugin provides various ways to notify the user of new and unread
+email.
+
+%description plugin-notification -l pl.UTF-8
+Ta wtyczka udostępnia różne sposoby informowania użytkownika o nowej i
+nieprzeczytanej poczcie.
+
+%package plugin-perl
+Summary:	perl plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka perl dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-perl
+Obsoletes:	sylpheed-claws-plugin-perl
+
+%description plugin-perl
+This plugin is intended to extend the filtering possibilities of
+Claws-Mail. It provides a Perl interface to Claws-Mail filtering
+mechanism, allowing the use of full Perl power in email filters.
+
+%description plugin-perl -l pl.UTF-8
+Ta wtyczka ma na celu rozszerzenie możliwości filtrowania
+Sylpheeda-Claws. Udostępnia perlowy interfejs do mechanizmów
+filtrowania Sylpheeda-Claws, pozwalając na użycie pełnej mocy Perla w
+filtrach wiadomości.
+
+%package plugin-pdf_viewer
+Summary:	pdf_viewer plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka pdf_viewer dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
-Provides:	sylpheed-claws-plugin-trayicon
-Obsoletes:	sylpheed-claws-plugin-trayicon
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
+Requires:	ghostscript
+
+%description plugin-pdf_viewer
+This plugin enables the viewing of PDF and PostScript attachments.
+
+%description plugin-pdf_viewer -l pl.UTF-8
+Ta wtyczka umożliwia wyświetlanie załączników w formacie PDF i
+PostScript.
+
+%package plugin-python
+Summary:	python plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka python dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-python
+This plugin provides Python integration features.
+
+%description plugin-python -l pl.UTF-8
+Wtyczka do pythona.
+
+%package plugin-libravatar
+Summary:	Avatar fetching plugin
+Summary(pl.UTF-8):	Wtyczka pobierająca avatary
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-libravatar
+Avatar fetching plugin.
+
+%description plugin-libravatar -l pl.UTF-8
+Wtyczka pobierająca avatary.
+
+%package plugin-rssyl
+Summary:	RSSyl plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka RSSyl dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-rssyl
+Obsoletes:	sylpheed-claws-plugin-rssyl
+
+%description plugin-rssyl
+This plugin allows you to read your favorite newsfeeds in Claws-Mail.
+RSS 1.0, 2.0 and Atom feeds are currently supported.
+
+%description plugin-rssyl -l pl.UTF-8
+Ta wtyczka pozwala na czytanie ulubionych nowinek w Sylpheedzie-Claws.
+Aktualnie obsługiwane są formaty RSS 1.0, 2.0 i Atom.
+
+%package plugin-spamreport
+Summary:	SpamReport plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka SpamReport dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
 
-%description plugin-trayicon
-This 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.
+%description plugin-spamreport
+This plugin allows you to upload spams to various spam reporting
+places, like http://www.signal-spam.fr/ .
 
-%description plugin-trayicon -l pl
-Wtyczka umieszczaj±ca w tacce systemowej ikonê informuj±c± o nadej¶ciu
-nowej poczty. Ikona wy¶wietla dane na temat wiadomo¶ci (ilo¶æ nowych,
-nieprzeczytanych i wszystkich) a jej menu pozwala wykonywaæ
-najpopularniejsze operacje.
+%package plugin-vcalendar
+Summary:	vCalendar plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka vCalendar dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+Provides:	sylpheed-claws-plugin-vcalendar
+Obsoletes:	sylpheed-claws-plugin-vcalendar
+
+%description plugin-vcalendar
+This plugin enables vCalendar message handling like that produced by
+Evolution or Outlook and handles webCal subscriptions.
+
+%description plugin-vcalendar -l pl.UTF-8
+Ta wtyczka pozwala na obsługę wiadomości vCalendar, takich jak te
+tworzone przez Evolution czy Outlooka, a także obsługuje subskrypcje
+webCal.
 
 %prep
 %setup -q
+%patch0 -p1
 
-rm -f po/stamp-po
+%{__rm} po/stamp-po
 
 %build
 %{__libtoolize}
@@ -267,24 +383,39 @@ rm -f po/stamp-po
 %{__autoheader}
 %{__automake}
 %configure \
-	--%{?with_clamav:en}%{!?with_clamav:dis}able-clamav-plugin \
 	--%{?with_compface:en}%{!?with_compface:dis}able-compface \
-	--%{?with_gnomeprint:en}%{!?with_gnomeprint:dis}able-gnomeprint \
-	--%{?with_gpg:en}%{!?with_gpg:dis}able-pgpcore-plugin \
-	--%{?with_gpg:en}%{!?with_gpg:dis}able-pgpmime-plugin \
-	--%{?with_gpg:en}%{!?with_gpg:dis}able-pgpinline-plugin \
 	--%{?with_ipv6:en}%{!?with_ipv6:dis}able-ipv6 \
 	--%{?with_jpilot:en}%{!?with_jpilot:dis}able-jpilot \
 	--%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \
-	--%{?with_ssl:en}%{!?with_ssl:dis}able-openssl \
-	--enable-aspell \
-	--enable-bogofilter \
-	--enable-dillo-viewer-plugin \
-	--enable-gdk-pixbuf \
+	--%{?with_tls:en}%{!?with_tls:dis}able-gnutls \
+	--enable-acpi_notifier-plugin \
+	--enable-address_keeper-plugin \
+	--enable-archive-plugin \
+	--enable-att_remover-plugin \
+	--enable-attachwarner-plugin \
+	--enable-bogofilter-plugin \
+	--enable-bsfilter-plugin \
+	--enable-clamd-plugin \
+	--enable-fancy-plugin \
+	--enable-fetchinfo-plugin \
+	--enable-gdata-plugin \
+	--enable-mailmbox-plugin \
+	--enable-newmail-plugin \
+	--enable-notification-plugin \
+	--enable-pdf_viewer-plugin \
+	--enable-perl-plugin \
+	--enable-python-plugin \
+	--%{?with_gpg:en}%{!?with_gpg:dis}able-pgpcore-plugin \
+	--%{?with_gpg:en}%{!?with_gpg:dis}able-pgpmime-plugin \
+	--%{?with_gpg:en}%{!?with_gpg:dis}able-pgpinline-plugin \
+	--enable-rssyl-plugin \
+	--enable-smime-plugin \
+	--enable-spamassassin-plugin \
+	--enable-spam_report-plugin \
+	--enable-tnef_parse-plugin \
+	--enable-vcalendar-plugin \
 	--enable-libetpan \
 	--enable-pthread \
-	--enable-spamassassin-plugin \
-	--enable-trayicon-plugin \
 	--disable-static
 
 %{__make}
@@ -296,11 +427,14 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/%{name}/themes,%{_desktopdir},%{_pixmapsd
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{deps,la}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/RELEASE_NOTES
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/manual/{en,es,fr}/*.{pdf,ps,html,txt}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{deps,la}
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/manual/{en,es,fr,pl}/*.{pdf,ps,html}
+mv $RPM_BUILD_ROOT%{_localedir}/{id_ID,id}
 
 %find_lang %{name}
 
@@ -315,21 +449,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README* TODO
+%doc AUTHORS ChangeLog* NEWS README* RELEASE_NOTES TODO
 %{_mandir}/man1/%{name}.1*
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/manual
+%dir %{_docdir}/%{name}
 %dir %{_datadir}/%{name}/themes
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
-%{_datadir}/%{name}/manual/en
-%lang(es) %{_datadir}/%{name}/manual/es
-%lang(fr) %{_datadir}/%{name}/manual/fr
-%lang(pl) %{_datadir}/%{name}/manual/pl
+# no (big) external deps
+%attr(755,root,root) %{_libdir}/%{name}/plugins/acpi_notifier.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/address_keeper.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/attachwarner.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/att_remover.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/bogofilter.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/bsfilter.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/clamd.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/fetchinfo.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/mailmbox.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/managesieve.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/newmail.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/spamassassin.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/tnef_parse.so
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
 %{_iconsdir}/hicolor/48x48/apps/%{name}.png
+%{_iconsdir}/hicolor/64x64/apps/%{name}.png
+%{_iconsdir}/hicolor/128x128/apps/%{name}.png
 
 %files devel
 %defattr(644,root,root,755)
@@ -339,19 +485,9 @@ rm -rf $RPM_BUILD_ROOT
 %files plugins
 %defattr(644,root,root,755)
 
-%files plugin-bogofilter
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/bogofilter.so
-
-%if %{with clamav}
-%files plugin-clamav
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/clamav_plugin.so
-%endif
-
-%files plugin-dillo
+%files plugin-libravatar
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/dillo_viewer.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/libravatar.so
 
 %if %{with gpg}
 %files plugin-pgpcore
@@ -367,10 +503,46 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/plugins/pgpmime.so
 %endif
 
-%files plugin-spamassassin
+%files plugin-smime
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/spamassassin.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/smime.so
+
+%files plugin-archive
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/archive.so
+
+%files plugin-fancy
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/fancy.so
+
+%files plugin-gdata
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/gdata.so
+
+%files plugin-notification
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/notification.so
+
+%files plugin-perl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/perl.so
+
+%files plugin-pdf_viewer
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/pdf_viewer.so
+
+%files plugin-python
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
+
+%files plugin-rssyl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/rssyl.so
+
+%files plugin-spamreport
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/spamreport.so
 
-%files plugin-trayicon
+%files plugin-vcalendar
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/trayicon.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/vcalendar.so