- updated to 3.17.5auto/th/claws-mail-3.17.5-1

- added link patch (drop bogus libs from LDAP)
- updated dependencies, added -plugin-litehtml_viewer

2 files changed, 265 insertions, 185 deletions

diff --git a/claws-mail-link.patch b/claws-mail-link.patch
new file mode 100644
index 0000000..7ef3c9f
--- /dev/null
+++ b/claws-mail-link.patch
@@ -0,0 +1,15 @@
+--- claws-mail-3.17.5/configure.ac.orig	2020-05-15 19:10:01.399227455 +0200
++++ claws-mail-3.17.5/configure.ac	2020-05-15 19:25:54.560730403 +0200
+@@ -794,9 +794,9 @@
+ 		AC_MSG_RESULT(yes)
+ 
+ 		dnl check for available libraries, and pull them in
+-		AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
+-		AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
+-		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
++		AC_CHECK_FUNC(res_query, [], [AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")])
++		AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")])
++		AC_CHECK_FUNC(gethostbyaddr, [], [AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")])
+ 		AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
+ 				 $LDAP_LIBS)
+ 
diff --git a/claws-mail.spec b/claws-mail.spec
index 10ae8ed..136a3ac 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -6,60 +6,85 @@
 %bcond_without	jpilot		# build without JPilot support
 %bcond_without	ldap		# build without LDAP support
 %bcond_without	tls		# build without gnuTLS support
+%bcond_with	valgrind	# Valgrind support for debugging
 
 Summary:	A bleeding edge branch of Sylpheed, a GTK2 based, lightweight, and fast e-mail client
 Summary(pl.UTF-8):	Rozwojowa wersja Sylpheed z dużą ilością zmian oraz ulepszeń
 Name:		claws-mail
-Version:	3.17.3
-Release:	4
+Version:	3.17.5
+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:	4dba4238f91bc2f4e146379842a17ad3
+#Source0Download: https://www.claws-mail.org/releases.php
+Source0:	https://www.claws-mail.org/releases/%{name}-%{version}.tar.xz
+# Source0-md5:	c736b9fe0b51d7ef6fb35734e257346d
 Source1:	%{name}.desktop
-URL:		http://www.claws-mail.org/
+Patch0:		%{name}-link.patch
+URL:		https://www.claws-mail.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-BuildRequires:	bzip2-devel
+BuildRequires:	cairo-devel
 %{?with_compface:BuildRequires:	compface-devel}
+BuildRequires:	curl-devel
+BuildRequires:	dbus-devel >= 0.60
+BuildRequires:	dbus-glib-devel >= 0.60
+BuildRequires:	docbook-utils
+# or enchant2-devel >= 2.0.0, but currently 1.4 is preferred
 BuildRequires:	enchant-devel >= 1.4.0
-BuildRequires:	gettext-tools
-BuildRequires:	gmp-devel
-%{?with_tls:BuildRequires:	gnutls-devel >= 2.6.0}
-%{?with_gpg:BuildRequires:	gpgme-devel >= 1:0.4.5}
+BuildRequires:	expat-devel
+BuildRequires:	fontconfig-devel
+BuildRequires:	gdk-pixbuf2-devel >= 2.26
+BuildRequires:	gettext-tools >= 0.18
+BuildRequires:	glib2-devel >= 1:2.36
+%{?with_tls:BuildRequires:	gnutls-devel >= 3.0}
+%{?with_gpg:BuildRequires:	gpgme-devel >= 1:1.1.1}
 BuildRequires:	gtk+2-devel >= 2:2.24.0
-BuildRequires:	gtk-webkit-devel
+BuildRequires:	gtk-webkit-devel >= 1.10.0
+BuildRequires:	gumbo-parser-devel >= 0.10
 BuildRequires:	libarchive-devel
-BuildRequires:	libcanberra-gtk-devel
-BuildRequires:	libetpan-devel >= 0.57
+BuildRequires:	libcanberra-gtk-devel >= 0.6
+BuildRequires:	libetpan-devel >= 1.9.4
 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:	librsvg-devel >= 1:2.40.5
+BuildRequires:	libsoup-devel >= 2.4
+BuildRequires:	libsoup-gnome-devel >= 2.26
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:2
+#TODO: libunity-devel
 BuildRequires:	libytnef-devel
+BuildRequires:	nettle-devel
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
-%if %{with jpilot}
-BuildRequires:	bluez-libs-devel
-BuildRequires:	pilot-link-devel
-%endif
-BuildRequires:	perl-devel
+BuildRequires:	perl-devel >= 1:5.8.0
+%{?with_jpilot:BuildRequires:	pilot-link-devel}
 BuildRequires:	pkgconfig
-BuildRequires:	poppler-glib-devel
-BuildRequires:	python-devel
-BuildRequires:	python-pygtk-devel
+BuildRequires:	poppler-glib-devel >= 0.12.0
+BuildRequires:	python-devel >= 1:2.5
+BuildRequires:	python-pygtk-devel >= 2:2.10.3
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.5
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texlive-jadetex
 BuildRequires:	texlive-latex-marvosym
+%{?with_valgrind:BuildRequires:	valgrind-devel >= 2.4.0}
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xz
+BuildRequires:	zlib-devel
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
+Requires:	enchant >= 1.4.0
+Requires:	dbus-glib >= 0.60
+Requires:	gdk-pixbuf2 >= 2.26
+Requires:	glib2 >= 1:2.36
+%{?with_tls:Requires:	gnutls >= 3.0}
 Requires:	gtk+2 >= 2:2.24.0
+Requires:	libetpan >= 1.9.4
+Requires:	librsvg >= 1:2.40.5
+%{?with_ldap:Requires:	openldap-libs >= 2.3.0}
+Requires:	startup-notification >= 0.5
 Provides:	sylpheed-claws
 Obsoletes:	claws-mail-plugin-acpi_notifier
 Obsoletes:	claws-mail-plugin-address_keeper
@@ -101,9 +126,14 @@ Summary:	Headers from Claws-Mail
 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.54
+Requires:	enchant-devel >= 1.4.0
+Requires:	glib2-devel >= 1:2.36
+%{?with_tls:Requires:	gnutls-devel >= 3.0}
+%{?with_gpg:Requires:	gpgme-devel >= 1:1.1.1}
+Requires:	gtk+2-devel >= 2:2.24.0
+Requires:	libetpan-devel >= 1.9.4
+%{?with_ldap:Requires:	openldap-devel >= 2.3.0}
+%{?with_jpilot:Requires:	pilot-link-devel}
 Provides:	sylpheed-claws-devel
 Obsoletes:	sylpheed-claws-devel
 
@@ -118,18 +148,23 @@ Summary:	Special plugins for Claws-Mail (metapackage)
 Summary(pl.UTF-8):	Dodatkowe wtyczki dla Claws-Mail (metapakiet)
 Group:		X11/Applications/Mail
 Requires:	%{name} = %{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-archive = %{version}-%{release}
 Requires:	%{name}-plugin-fancy = %{version}-%{release}
 Requires:	%{name}-plugin-gdata = %{version}-%{release}
+Requires:	%{name}-plugin-libravatar = %{version}-%{release}
+Requires:	%{name}-plugin-litehtml_viewer = %{version}-%{release}
 Requires:	%{name}-plugin-notification = %{version}-%{release}
+Requires:	%{name}-plugin-pdf_viewer = %{version}-%{release}
 Requires:	%{name}-plugin-perl = %{version}-%{release}
+%if %{with gpg}
+Requires:	%{name}-plugin-pgpinline = %{version}-%{release}
+Requires:	%{name}-plugin-pgpmime = %{version}-%{release}
+%endif
+Requires:	%{name}-plugin-python = %{version}-%{release}
 Requires:	%{name}-plugin-rssyl = %{version}-%{release}
+%if %{with gpg}
 Requires:	%{name}-plugin-smime = %{version}-%{release}
+%endif
 Requires:	%{name}-plugin-spamreport = %{version}-%{release}
 Requires:	%{name}-plugin-vcalendar = %{version}-%{release}
 Provides:	sylpheed-claws-extra-plugins
@@ -147,75 +182,6 @@ This is collection of some usefull plugins for Claws-Mail
 Jest to zbiór kilku dodatkowych wtyczek powiększających możliwości
 Claws-Mail (metapakiet).
 
-%package plugin-pgpcore
-Summary:	PGP/Core plugin for Claws-Mail
-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
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
-
-%description plugin-pgpcore
-This plugin handles core PGP functions.
-
-%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.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
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
-
-%description plugin-pgpinline
-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.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.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
-Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
-
-%description plugin-pgpmime
-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.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-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}
-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
@@ -235,6 +201,8 @@ Summary:	fancy plugin for Claws-Mail
 Summary(pl.UTF-8):	Wtyczka fancy dla Claws-Mail
 Group:		X11/Applications/Mail
 Requires:	%{name} = %{version}-%{release}
+Requires:	gtk-webkit >= 1.10.0
+Requires:	libsoup-gnome >= 2.26
 
 %description plugin-fancy
 Renders HTML e-mail using the WebKit library.
@@ -248,6 +216,7 @@ Summary:	gdata plugin for Claws-Mail
 Summary(pl.UTF-8):	Wtyczka gdata dla Claws-Mail
 Group:		X11/Applications/Mail
 Requires:	%{name} = %{version}-%{release}
+Requires:	libgdata >= 0.17.2
 
 %description plugin-gdata
 gdata plugin for Claws-Mail.
@@ -255,11 +224,40 @@ gdata plugin for Claws-Mail.
 %description plugin-gdata -l pl.UTF-8
 Wtyczka gdata dla Claws-Mail.
 
+%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-litehtml_viewer
+Summary:	Light HTML viewer plugin for Claws Mail
+Summary(pl.UTF-8):	Wtyczka z lekką przeglądarką HTML dla Claws Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+Requires:	gumbo-parser >= 0.10
+
+%description plugin-litehtml_viewer
+Viewer plugin for HTML emails, using the litehtml library
+(<http://www.litehtml.com/>).
+
+%description plugin-litehtml_viewer -l pl.UTF-8
+Wtyczka z przeglądarką do wiadomości HTML, wykorzystująca bibliotekę
+litehtml (<http://www.litehtml.com/>).
+
 %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}
+Requires:	libcanberra-gtk >= 0.6
+Requires:	libnotify >= 0.4.3
 Provides:	sylpheed-claws-plugin-notification
 Obsoletes:	sylpheed-claws-plugin-notification
 
@@ -296,6 +294,7 @@ Summary(pl.UTF-8):	Wtyczka pdf_viewer dla Claws-Mail
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 Requires:	ghostscript
+Requires:	poppler-glib >= 0.12.0
 
 %description plugin-pdf_viewer
 This plugin enables the viewing of PDF and PostScript attachments.
@@ -304,6 +303,58 @@ This plugin enables the viewing of PDF and PostScript attachments.
 Ta wtyczka umożliwia wyświetlanie załączników w formacie PDF i
 PostScript.
 
+%package plugin-pgpcore
+Summary:	PGP/Core plugin for Claws-Mail
+Summary(pl.UTF-8):	Wtyczka PGP/Core dla Claws-Mail
+Group:		X11/Applications/Mail
+Requires:	%{name} = %{version}-%{release}
+Requires:	gpgme >= 1:1.1.1
+Provides:	sylpheed-claws-plugin-pgpcore
+Obsoletes:	sylpheed-claws-plugin-pgpcore
+Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
+
+%description plugin-pgpcore
+This plugin handles core PGP functions.
+
+%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.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
+Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
+
+%description plugin-pgpinline
+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.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.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
+Conflicts:	sylpheed-claws-plugins <= 2.3.0-1
+
+%description plugin-pgpmime
+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.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-python
 Summary:	python plugin for Claws-Mail
 Summary(pl.UTF-8):	Wtyczka python dla Claws-Mail
@@ -316,18 +367,6 @@ 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
@@ -344,6 +383,24 @@ RSS 1.0, 2.0 and Atom feeds are currently supported.
 Ta wtyczka pozwala na czytanie ulubionych nowinek w Sylpheedzie-Claws.
 Aktualnie obsługiwane są formaty RSS 1.0, 2.0 i Atom.
 
+%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}
+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-spamreport
 Summary:	SpamReport plugin for Claws-Mail
 Summary(pl.UTF-8):	Wtyczka SpamReport dla Claws-Mail
@@ -352,13 +409,18 @@ Requires:	%{name} = %{version}-%{release}
 
 %description plugin-spamreport
 This plugin allows you to upload spams to various spam reporting
-places, like http://www.signal-spam.fr/ .
+places, like <http://www.signal-spam.fr/>.
+
+%description plugin-spamreport -l pl.UTF-8
+Ta wtyczka pozwala przesyłać spam do różnych miejsc raportowania,
+takich jak <http://www.signal-spam.fr/>.
 
 %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}
+Requires:	libical >= 2.0.0
 Provides:	sylpheed-claws-plugin-vcalendar
 Obsoletes:	sylpheed-claws-plugin-vcalendar
 
@@ -373,6 +435,7 @@ webCal.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__rm} po/stamp-po
 
@@ -384,39 +447,17 @@ webCal.
 %{__autoheader}
 %{__automake}
 %configure \
-	--%{?with_compface:en}%{!?with_compface:dis}able-compface \
-	--%{?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_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-compface%{!?with_compface:=no} \
+	--enable-gnutls%{!?with_tls:=no} \
+	--enable-ipv6%{!?with_ipv6:=no} \
+	--enable-jpilot%{!?with_jpilot:=no} \
+	--enable-ldap%{!?with_ldap:=no} \
 	--enable-libetpan \
-	--enable-pthread \
+	--enable-pgpcore-plugin%{!?with_gpg:=no} \
+	--enable-pgpinline-plugin%{!?with_gpg:=no} \
+	--enable-pgpmime-plugin%{!?with_gpg:=no} \
+	--enable-smime-plugin%{!?with_gpg:=no} \
+	--enable-valgrind%{!?with_valgrind:=no} \
 	--disable-static
 
 %{__make}
@@ -435,8 +476,8 @@ cp -p %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/RELEASE_NOTES
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/manual/{en,es,fr}/*.{pdf,ps,html,txt}
 
-mv $RPM_BUILD_ROOT%{_localedir}/{id_ID,id}
-mv $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{id_ID,id}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
 
 %find_lang %{name}
 
@@ -451,100 +492,124 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog* NEWS README* RELEASE_NOTES TODO
-%{_mandir}/man1/%{name}.1*
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS ChangeLog* NEWS README RELEASE_NOTES TODO
+%attr(755,root,root) %{_bindir}/claws-mail
 %dir %{_datadir}/%{name}
-%dir %{_docdir}/%{name}
 %dir %{_datadir}/%{name}/themes
+%dir %{_docdir}/%{name}
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 # 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/attachwarner.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/dillo.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
+# R: zlib
 %attr(755,root,root) %{_libdir}/%{name}/plugins/spamassassin.so
+# R: libytnef
 %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
+%{_desktopdir}/claws-mail.desktop
+%{_pixmapsdir}/claws-mail.png
+%{_iconsdir}/hicolor/48x48/apps/claws-mail.png
+%{_iconsdir}/hicolor/64x64/apps/claws-mail.png
+%{_iconsdir}/hicolor/128x128/apps/claws-mail.png
+%{_mandir}/man1/claws-mail.1*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/%{name}
-%{_pkgconfigdir}/*.pc
+%{_includedir}/claws-mail
+%{_pkgconfigdir}/claws-mail.pc
 
 %files plugins
 %defattr(644,root,root,755)
 
-%files plugin-libravatar
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/libravatar.so
-
-%if %{with gpg}
-%files plugin-pgpcore
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/pgpcore.so
-
-%files plugin-pgpinline
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/pgpinline.so
-
-%files plugin-pgpmime
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/pgpmime.so
-%endif
-
-%files plugin-smime
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/smime.so
-
+# R: libarchive
 %files plugin-archive
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/archive.so
 
+# R: curl gtk-webkit libsoup libsoup-gnome
 %files plugin-fancy
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/fancy.so
 
+# R: libgdata
 %files plugin-gdata
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gdata.so
 
+# R: curl-libs
+%files plugin-libravatar
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/libravatar.so
+
+# R: cairo curl fontconfig gumbo-parser
+%files plugin-litehtml_viewer
+%attr(755,root,root) %{_libdir}/%{name}/plugins/litehtml_viewer.so
+
+# R: libcanberra-gtk libnotify [libunity]
 %files plugin-notification
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/notification.so
 
+# R: perl-base
 %files plugin-perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/perl.so
 
+# R: poppler-glib
 %files plugin-pdf_viewer
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/pdf_viewer.so
 
+%if %{with gpg}
+# R: gpgme
+%files plugin-pgpcore
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/pgpcore.so
+
+# R: gpgme
+%files plugin-pgpinline
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/pgpinline.so
+
+# R: gpgme
+%files plugin-pgpmime
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/pgpmime.so
+%endif
+
+# R: python-libs
 %files plugin-python
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
 
+# R: curl expat
 %files plugin-rssyl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/rssyl.so
 
+%if %{with gpg}
+# R: gpgme
+%files plugin-smime
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/smime.so
+%endif
+
+# R: curl
 %files plugin-spamreport
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/spamreport.so
 
+# R: curl libical perl-base
 %files plugin-vcalendar
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/vcalendar.so