Updated to 3.17.4

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  claws-mail-3.17.3.tar.xz: 6eace04648c9fbc3ead06a5f7d2043756bd927ef
+  claws-mail-3.17.4.tar.xz: f91f1e687175a97960b576f9357e07ff38f91e2d

claws-mail.spec

@@ -6,10 +6,18 @@
 # modules required by these scripts
 %define __noautoreq 'perl(.*)'
 
+# enable/disable unsecure webkit1 dep
+# aka enable / disable fancy plugin
+%bcond_with webkit1
+
+# enable/disable litehtml_viewer plugin,
+# only available claws-mail > 3.17.3
+%bcond_with litehtml
+
 Summary:	The user-friendly, lightweight and fast GTK2 based email client
 Name:		claws-mail
-Version:	3.17.3
+Version:	3.17.4
-Release:	2
+Release:	1
 Epoch:		1
 License:	GPLv3+
 Group:		Networking/Mail
@@ -56,28 +64,34 @@ BuildRequires:	pkgconfig(libcanberra-gtk)
 BuildRequires:	pkgconfig(libcurl)
 BuildRequires:	pkgconfig(libical)
 BuildRequires:	pkgconfig(libgcrypt)
-BuildRequires:	pkgconfig(libgdata)
 BuildRequires:	pkgconfig(libgnome-2.0) >= 2.0
 BuildRequires:	pkgconfig(libnotify)
 BuildRequires:	pkgconfig(libstartup-notification-1.0) >= 0.5
 BuildRequires:	pkgconfig(libxml-2.0)
 BuildRequires:	pkgconfig(NetworkManager) >= 0.6.2
-BuildRequires:	pkgconfig(pilot-link)
 BuildRequires:	pkgconfig(poppler)
 BuildRequires:	pkgconfig(poppler-glib)
 BuildRequires:	pkgconfig(pygtk-2.0)
 BuildRequires:	pkgconfig(sm)
 BuildRequires:	pkgconfig(valgrind)
-BuildRequires:	pkgconfig(webkit-1.0)
 Requires:	aspell-dictionary
 Requires:	common-licenses
 Requires:	compface
 Requires:	rootcerts
 Requires:	gsettings-desktop-schemas
+# POP3 / IMAP authentication
+#Requires:	sasl-plug-plain
+#Requires:	sasl-plug-login
 # These are dropped
 Obsoletes:	%{name}-clamav-plugin < %{EVRD}
 Obsoletes:	%{name}-dillo_viewer-plugin < %{EVRD}
 Obsoletes:	%{name}-trayicon-plugin < %{EVRD}
+%if %{without litehtml}
+Obsoletes:	%{name}-litehtml_viewer-plugin < %{EVRD}
+%endif
+%if %{without webkit1}
+Obsoletes:	%{name}-fancy-plugin < %{EVRD}
+%endif
 
 %description
 Claws-Mail is an e-mail client (and news reader) based on GTK+2, running
@@ -86,36 +100,6 @@ on X Window System, and aiming for:
  * Graceful, and sophisticated interface
  * Easy configuration, intuitive operation
  * Abundant features
-The appearance and interface are similar to some popular e-mail clients for
-Windows, such as Outlook Express, Becky!, and Datula. The interface is also
-designed to emulate the mailers on Emacsen, and almost all commands are
-accessible with the keyboard.
-
-The messages are managed by MH format, and you'll be able to use it together
-with another mailer based on MH format (like Mew). You can also utilize
-fetchmail or/and procmail, and external programs on receiving (like inc or
-imget).
-
-This is an improved version over the "bare" sylpheed package. It has
-some additional features, and also extends existing features.
-
-Addtitional features include:
-    o Scoring
-    o Spell checking
-    o Return receipts
-
-Improved features include:
-    o SMTP Auth
-    o Filtering
-    o MIME attachments
-    o Integrated News reader
-    o Automatic mail checking
-    o Line-wrapping
-    o XML-based addressbook
-    o Newly arrived and unread message management
-    o Printing
-    o GnuPG support
-    o Address book supports JPilot, LDAP, LDIF, and vCard data files
 
 For a complete listing of Features: http://www.claws-mail.org/features.php
 
@@ -281,10 +265,11 @@ Renders HTML e-mail using dillo webbrowser
 %{_libdir}/%{name}/plugins/dillo.so
 
 #----------------------------------------------------------------------------
-
+%if %{with webkit1}
 %package fancy-plugin
 Summary:	This Claws Mail plugin renders HTML e-mails through WebKit
 Group:		Networking/Mail
+BuildRequires:	pkgconfig(webkit-1.0)
 Requires:	%{name} = %{EVRD}
 
 %description fancy-plugin
@@ -293,7 +278,7 @@ Renders HTML e-mail using the WebKit library.
 %files fancy-plugin
 #%{_datadir}/appdata/claws-mail-fancy.metainfo.xml
 %{_libdir}/%{name}/plugins/fancy.so
-
+%endif
 #----------------------------------------------------------------------------
 
 %package fetchinfo-plugin
@@ -315,6 +300,8 @@ and retrieval time.
 %package gdata-plugin
 Summary:	This Claws Mail plugin enables access to GData (Google services)
 Group:		Networking/Mail
+BuildRequires:	pkgconfig(libgdata)
+BuildConflicts:	gmt-devel
 Requires:	%{name} = %{EVRD}
 
 %description gdata-plugin
@@ -354,6 +341,21 @@ libravatar service ( http://www.libravatar.org ).
 #%{_datadir}/appdata/claws-mail-libravatar.metainfo.xml
 %{_libdir}/%{name}/plugins/libravatar.so
 
+#----------------------------------------------------------------------------
+%if %{with litehtml}
+%package litehtml_viewer-plugin
+Summary:	Litehtml viewer plugin for %{name}
+Group:		Networking/Mail
+BuildRequires:	pkgconfig(gumbo)
+Requires:	%{name} >= %{EVRD}
+Obsoletes:	%{name}-fancy-plugin < 1:3.17.4
+
+%description litehtml_viewer-plugin
+Renders HTML e-mail using the litehml library.
+
+%files litehtml_viewer-plugin
+%{_libdir}/%{name}/plugins/litehtml_viewer.so
+%endif
 #----------------------------------------------------------------------------
 
 %package mailmbox-plugin
@@ -624,10 +626,13 @@ This Claws Mail tools.
 %if %{flag_gtk3}
 	--enable-gtk3 \
 %endif
+	--enable-appdata \
 	--enable-crash-dialog \
+	--enable-gdata-plugin \
 	--disable-static \
 	--disable-rpath \
-	--disable-manual
+	--disable-manual \
+	%{!?with_webkit1:--disable-fancy-plugin}
 
 %make LIBTOOL=%{_bindir}/libtool