From 9711e9ea5022da2ee6d4626f5906878f477003d9 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 23 Oct 2014 03:28:35 +1100 Subject: [PATCH] Build appdata files and cleanup spec after recent commits --- .abf.yml | 2 - claws-mail.spec | 100 +++++++++++++++++++++++++++++++----------------- 2 files changed, 65 insertions(+), 37 deletions(-) diff --git a/.abf.yml b/.abf.yml index c2f6f7e..7b26767 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,2 @@ -removed_sources: - claws-mail-3.10.1.tar.bz2: 1fb18ce612f0880143f85b418cb4d042d407a068 sources: claws-mail-3.11.0.tar.xz: 1fc919e7d4357408a04131c4195878ea920de4f0 diff --git a/claws-mail.spec b/claws-mail.spec index 0231623..38b186b 100644 --- a/claws-mail.spec +++ b/claws-mail.spec @@ -7,7 +7,7 @@ Summary: The user-friendly, lightweight and fast GTK2 based email client Name: claws-mail Version: 3.11.0 -Release: 1 +Release: 2 Epoch: 1 License: GPLv3+ Group: Networking/Mail @@ -19,16 +19,25 @@ BuildRequires: bison BuildRequires: flex BuildRequires: docbook-utils BuildRequires: imagemagick +BuildRequires: intltool +BuildRequires: compface-devel +BuildRequires: gpgme-devel > 0.4.5 +BuildRequires: libetpan-devel >= 0.42 +BuildRequires: libxml2-devel +BuildRequires: openldap-devel +BuildRequires: perl-devel BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(dbus-1) >= 0.60 BuildRequires: pkgconfig(dbus-glib-1) >= 0.60 BuildRequires: pkgconfig(enchant) >= 1.0.0 +BuildRequires: pkgconfig(expat) 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(libarchive) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libgdata) @@ -44,19 +53,10 @@ BuildRequires: pkgconfig(pygtk-2.0) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(webkit-1.0) -BuildRequires: compface-devel -BuildRequires: gpgme-devel > 0.4.5 -BuildRequires: libetpan-devel >= 0.42 -BuildRequires: libxml2-devel -BuildRequires: openldap-devel -BuildRequires: perl-devel -BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(libarchive) -BuildRequires: intltool +Requires: aspell-dictionary +Requires: common-licenses Requires: compface Requires: rootcerts -Requires: common-licenses -Requires: aspell-dictionary # These are dropped Obsoletes: %{name}-clamav-plugin < %{EVRD} Obsoletes: %{name}-dillo_viewer-plugin < %{EVRD} @@ -105,7 +105,7 @@ For a complete listing of Features: http://www.claws-mail.org/features.php %files -f %{name}.lang %{_bindir}/%{name} %{_bindir}/sylpheed-claws -#{_datadir}/appdata/claws-mail.appdata.xml +%{_datadir}/appdata/claws-mail.appdata.xml %{_datadir}/applications/claws-mail.desktop %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins @@ -140,6 +140,7 @@ Requires: %{name} = %{EVRD} This plugin for Claws Mail enables mail notification via LEDs on some laptops. %files acpi-plugin +%{_datadir}/appdata/claws-mail-acpi_notifier.metainfo.xml %{_libdir}/%{name}/plugins/acpi_notifier.so #---------------------------------------------------------------------------- @@ -155,10 +156,25 @@ folder in the address book.Addresses are saved only if not found in the address book to avoid unwanted duplicates. %files address_keeper-plugin +%{_datadir}/appdata/claws-mail-address_keeper.metainfo.xml %{_libdir}/%{name}/plugins/address_keeper.so #---------------------------------------------------------------------------- +%package archive-plugin +Summary: Mail Archiver +Group: Networking/Mail +Requires: %{name} = %{EVRD} + +%description archive-plugin +This plugin adds archiving features to Claws Mail. + +%files archive-plugin +%{_datadir}/appdata/claws-mail-archive.metainfo.xml +%{_libdir}/%{name}/plugins/archive.so + +#---------------------------------------------------------------------------- + %package att_remover-plugin Summary: This Claws Mail plugin enables the removal of attachments Group: Networking/Mail @@ -168,6 +184,7 @@ Requires: %{name} = %{EVRD} This plugin for Claws Mail enables the removal of attachments. %files att_remover-plugin +%{_datadir}/appdata/claws-mail-att_remover.metainfo.xml %{_libdir}/%{name}/plugins/att_remover.so #---------------------------------------------------------------------------- @@ -181,6 +198,7 @@ Requires: %{name} = %{EVRD} This Claws Mail plugin enables attachment warnings. %files attachwarner-plugin +%{_datadir}/appdata/claws-mail-attachwarner.metainfo.xml %{_libdir}/%{name}/plugins/attachwarner.so #---------------------------------------------------------------------------- @@ -200,6 +218,7 @@ therefore it has better speed performance than SpamAssassin but might catch less spam. %files bogofilter-plugin +%{_datadir}/appdata/claws-mail-bogofilter.metainfo.xml %{_libdir}/%{name}/plugins/bogofilter.so #---------------------------------------------------------------------------- @@ -214,6 +233,7 @@ Check all messages that are received from an IMAP, LOCAL or POP account for spam using Bsfilter. %files bsfilter-plugin +%{_datadir}/appdata/claws-mail-bsfilter.metainfo.xml %{_libdir}/%{name}/plugins/bsfilter.so #---------------------------------------------------------------------------- @@ -228,6 +248,7 @@ Check all messages that are received from an IMAP, LOCAL or POP account for spam using Clam AntiVirus. %files clamd-plugin +%{_datadir}/appdata/claws-mail-clamd.metainfo.xml %{_libdir}/%{name}/plugins/clamd.so #---------------------------------------------------------------------------- @@ -241,6 +262,7 @@ Requires: %{name} = %{EVRD} Renders HTML e-mail using the WebKit library. %files fancy-plugin +%{_datadir}/appdata/claws-mail-fancy.metainfo.xml %{_libdir}/%{name}/plugins/fancy.so #---------------------------------------------------------------------------- @@ -256,6 +278,7 @@ information: UIDL, Sylpheeds account name, POP server, user ID and retrieval time. %files fetchinfo-plugin +%{_datadir}/appdata/claws-mail-fetchinfo.metainfo.xml %{_libdir}/%{name}/plugins/fetchinfo.so #---------------------------------------------------------------------------- @@ -270,6 +293,7 @@ Plugin to access to GData (Google services). The only currently implemented feature is inclusion of Google contacts into the address completion. %files gdata-plugin +%{_datadir}/appdata/claws-mail-gdata.metainfo.xml %{_libdir}/%{name}/plugins/gdata.so #---------------------------------------------------------------------------- @@ -284,6 +308,7 @@ Plugin to show the profile pictures associated to email addresses provided by libravatar service ( http://www.libravatar.org ). %files libravatar-plugin +%{_datadir}/appdata/claws-mail-libravatar.metainfo.xml %{_libdir}/%{name}/plugins/libravatar.so #---------------------------------------------------------------------------- @@ -297,6 +322,7 @@ Requires: %{name} = %{EVRD} This Claws Mail plugin provides direct access to mbox folders. %files mailmbox-plugin +%{_datadir}/appdata/claws-mail-mailmbox.metainfo.xml %{_libdir}/%{name}/plugins/mailmbox.so #---------------------------------------------------------------------------- @@ -311,6 +337,7 @@ This Claws Mail plugin can write a summary to a log file upon receiving new mail. It defaults to ~/Mail/NewLog. %files newmail-plugin +%{_datadir}/appdata/claws-mail-newmail.metainfo.xml %{_libdir}/%{name}/plugins/newmail.so #---------------------------------------------------------------------------- @@ -324,6 +351,7 @@ Requires: %{name} = %{EVRD} This Claws Mail plugin notifies about new mail. %files notification-plugin +%{_datadir}/appdata/claws-mail-notification.metainfo.xml %{_libdir}/%{name}/plugins/notification.so #---------------------------------------------------------------------------- @@ -337,6 +365,7 @@ Requires: %{name} = %{EVRD} This Claws Mail plugin This plugin handles PDF and PostScript attachments. %files pdfviewer-plugin +%{_datadir}/appdata/claws-mail-pdf_viewer.metainfo.xml %{_libdir}/%{name}/plugins/pdf_viewer.so #---------------------------------------------------------------------------- @@ -352,6 +381,7 @@ It provides a Perl interface to Claws Mail's filtering mechanism, allowing the use of full Perl power in email filters. %files perl-plugin +%{_datadir}/appdata/claws-mail-perl.metainfo.xml %{_libdir}/%{name}/plugins/perl.so #---------------------------------------------------------------------------- @@ -366,6 +396,7 @@ Handles core PGP functions and is a dependency of both the PGP/Inline and PGP/MIME plugins. %files pgpcore-plugin +%{_datadir}/appdata/claws-mail-pgpcore.metainfo.xml %{_libdir}/%{name}/plugins/pgpcore.so #---------------------------------------------------------------------------- @@ -381,6 +412,7 @@ Handles PGP/Inline signed and/or encrypted mails. You can decrypt mails, verify signatures or sign and encrypt your own mails. %files pgpinline-plugin +%{_datadir}/appdata/claws-mail-pgpinline.metainfo.xml %{_libdir}/%{name}/plugins/pgpinline.so %{_libdir}/%{name}/plugins/pgpinline.deps @@ -397,6 +429,7 @@ Handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify signatures or sign and encrypt your own mails. %files pgpmime-plugin +%{_datadir}/appdata/claws-mail-pgpmime.metainfo.xml %{_libdir}/%{name}/plugins/pgpmime.so %{_libdir}/%{name}/plugins/pgpmime.deps @@ -411,6 +444,7 @@ Requires: %{name} = %{EVRD} This plugin offers a Python scripting access to Claws Mail. %files python-plugin +%{_datadir}/appdata/claws-mail-python.metainfo.xml %{_libdir}/%{name}/plugins/python.so #---------------------------------------------------------------------------- @@ -425,6 +459,7 @@ This plugin allows you to read your favorite newsfeeds in Claws Mail. RSS 1.0, 2.0 and Atom feeds are currently supported. %files rssyl-plugin +%{_datadir}/appdata/claws-mail-rssyl.metainfo.xml %{_libdir}/%{name}/plugins/rssyl.so #---------------------------------------------------------------------------- @@ -438,6 +473,7 @@ Requires: %{name} = %{EVRD} This plugin allows to use S/Mime signatures and encryptions in Claws Mail. %files smime-plugin +%{_datadir}/appdata/claws-mail-smime.metainfo.xml %{_libdir}/%{name}/plugins/smime.so %{_libdir}/%{name}/plugins/smime.deps @@ -455,6 +491,7 @@ account using SpamAssassin. See README for configuration and set-up info. %files spamassassin-plugin %doc src/plugins/spamassassin/README +%{_datadir}/appdata/claws-mail-spamassassin.metainfo.xml %{_libdir}/%{name}/plugins/spamassassin.so #---------------------------------------------------------------------------- @@ -468,6 +505,7 @@ Requires: %{name} = %{EVRD} This Claws Mail plugin provides spamreport. %files spam_report-plugin +%{_datadir}/appdata/claws-mail-spam_report.metainfo.xml %{_libdir}/%{name}/plugins/spamreport.so #---------------------------------------------------------------------------- @@ -481,6 +519,7 @@ Requires: %{name} = %{EVRD} This Claws Mail plugin enables parsing MS-TNEF attachments. %files tnef_parse-plugin +%{_datadir}/appdata/claws-mail-tnef_parse.metainfo.xml %{_libdir}/%{name}/plugins/tnef_parse.so #---------------------------------------------------------------------------- @@ -497,22 +536,9 @@ send meetings, and creates a virtual folder with the meetings you have sent or received. %files vcalendar-plugin +%{_datadir}/appdata/claws-mail-vcalendar.metainfo.xml %{_libdir}/%{name}/plugins/vcalendar.so -%package archive-plugin -Summary: Mail Archiver -Group: Networking/Mail -Requires: %{name} = %{EVRD} - -%description archive-plugin -This plugin adds archiving features to Claws Mail - - -%files archive-plugin -%{_libdir}/%{name}/plugins/archive.so - - - #---------------------------------------------------------------------------- %prep @@ -521,24 +547,22 @@ This plugin adds archiving features to Claws Mail %build %configure2_5x \ + --enable-appdata \ + --enable-archive-plugin \ + --enable-compface \ + --enable-crash-dialog \ --enable-enchant \ + --enable-ipv6 \ --enable-jpilot \ --enable-ldap \ - --enable-crash-dialog \ - --enable-spamassassin-plugin \ - --enable-archive-plugin \ - --enable-ipv6 \ - --enable-compface \ --enable-gnutls \ --enable-networkmanager-support \ + --enable-spamassassin-plugin \ --disable-rpath \ --disable-static %make LIBTOOL=%{_bindir}/libtool -%check -make check - %install %makeinstall_std @@ -560,5 +584,11 @@ install -m644 %{name}.desktop %{buildroot}%{_datadir}/applications/ cp -a ABOUT-NLS AUTHORS NEWS README* TODO* RELEASE_NOTES tools %{buildroot}%{_docdir}/claws-mail/ rm -f %{buildroot}%{_docdir}/claws-mail/tools/Makefile* +# We don't build with plugin +rm -f %{buildroot}%{_datadir}/appdata/claws-mail-geolocation.metainfo.xml + %find_lang %{name} +%check +make check +