From d2966ef8ad13d8df4f7a3b993afd807487fc9a4d Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sat, 17 Nov 2012 01:09:35 +1100 Subject: [PATCH] LOG New version 3.9.0, spec cleanups --- .abf.yml | 3 +- claws-mail-3.8.1-fix-signature.patch | 25 -- claws-mail.spec | 367 +-------------------------- 3 files changed, 8 insertions(+), 387 deletions(-) delete mode 100644 claws-mail-3.8.1-fix-signature.patch diff --git a/.abf.yml b/.abf.yml index 0fb9463..5a0697b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ +--- sources: - "claws-mail-3.8.1.tar.bz2": c519d07121bfb3095c7a3d47e53b6726bf397ed8 + claws-mail-3.9.0.tar.bz2: 30ffefb20aa9422709df6b0769a34319169b7072 diff --git a/claws-mail-3.8.1-fix-signature.patch b/claws-mail-3.8.1-fix-signature.patch deleted file mode 100644 index 5e2eb9e..0000000 --- a/claws-mail-3.8.1-fix-signature.patch +++ /dev/null @@ -1,25 +0,0 @@ -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) - diff --git a/claws-mail.spec b/claws-mail.spec index b4ec3c1..60b76ec 100644 --- a/claws-mail.spec +++ b/claws-mail.spec @@ -10,8 +10,8 @@ Summary: The user-friendly, lightweight and fast GTK2 based email client Name: claws-mail -Version: 3.8.1 -Release: 4 +Version: 3.9.0 +Release: 1 Epoch: 1 License: GPLv3+ Group: %{Group} @@ -19,8 +19,6 @@ URL: http://www.claws-mail.org Source0: http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2 # 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 @@ -38,7 +36,6 @@ BuildRequires: docbook-utils BuildRequires: libsm-devel BuildRequires: openldap-devel BuildRequires: pilot-link-devel -BuildRequires: multiarch-utils BuildRequires: libetpan-devel >= 0.42 BuildRequires: flex BuildRequires: bison @@ -58,8 +55,6 @@ Provides: %{name}-tools Obsoletes: %{name}-spamassassin-plugin < %{EVRD} #Clamav is dropped Obsoletes: claws-mail-clamav-plugin < %{EVRD} -#Pdf Viever is gone -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. @@ -109,7 +104,7 @@ For a complete listing of Features: http://www.claws-mail.org/features.php %package devel Summary: Development files for %{name} Group: Development/Other -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVRD} Requires: aspell-dictionary %description -n %{name}-devel @@ -119,7 +114,7 @@ Development files and headers for %{name}. Summary: Bogofilter plugin for %{name} Group: %{Group} BuildRequires: bogofilter -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVRD} Requires: bogofilter %description bogofilter-plugin @@ -142,18 +137,15 @@ Summary: Dillo HTML viewer plugin for %{name} Group: %{Group} Requires: %{name} = %{EVRD} Requires: dillo -Provides: sylpheed-claws2-dillo_viewer-plugin -Obsoletes: sylpheed-claws2-dillo_viewer-plugin < %{EVRD} %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 Claws Mail. %package pgpcore-plugin Summary: PGP core plugin for %{name} Group: %{Group} Requires: %{name} = %{EVRD} -Provides: 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 @@ -164,8 +156,6 @@ Summary: PGP/Inline plugin for %{name} Group: %{Group} Requires: %{name} = %{EVRD} Requires: %{name}-pgpcore-plugin = %{EVRD} -Provides: sylpheed-claws2-pgpinline-plugin -Obsoletes: sylpheed-claws2-pgpinline-plugin < %{EVRD} %description pgpinline-plugin Handles PGP/Inline signed and/or encrypted mails. You can decrypt mails, @@ -176,8 +166,6 @@ Summary: PGP/MIME plugin for %{name} Group: %{Group} Requires: %{name} = %{EVRD} Requires: %{name}-pgpcore-plugin = %{EVRD} -Provides: sylpheed-claws2-pgpmime-plugin -Obsoletes: sylpheed-claws2-pgpmime-plugin < %{EVRD} %description pgpmime-plugin Handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify @@ -188,8 +176,6 @@ Summary: Spamassassin-plugin for %{name} Group: %{Group} Requires: %{name} = %{EVRD} Requires: spamassassin-spamd -Provides: sylpheed-claws2-spamassassin-plugin -Obsoletes: sylpheed-claws2-spamassassin-plugin < %{EVRD} %description spamassassin-plugin Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL @@ -199,8 +185,6 @@ account using SpamAssassin. See README for configuration and set-up info. Summary: Notafication icon for %{name} Group: %{Group} Requires: %{name} = %{EVRD} -Provides: sylpheed-claws2-trayicon-plugin -Obsoletes: sylpheed-claws2-trayicon-plugin < %{EVRD} %description trayicon-plugin Places an icon in the system tray that indicates whether you have any new mail. @@ -211,7 +195,6 @@ info. %prep %setup -q %patch0 -p1 -%patch1 -p0 %build %configure2_5x \ @@ -237,9 +220,6 @@ make check %install %makeinstall_std -# multiarch -%multiarch_includes %{buildroot}%{_includedir}/%{name}/config.h - ##remove duplicate man# rm -rf %{buildroot}%{_mandir} ## remove unneeded devel files @@ -272,7 +252,6 @@ rm -f %{buildroot}%{_docdir}/claws-mail/tools/Makefile* %files devel %{_includedir}/%{name} %{_libdir}/pkgconfig/claws-mail.pc -%{multiarch_includedir}/%{name}/config.h %files bogofilter-plugin %{_libdir}/%{name}/plugins/bogofilter.so @@ -304,337 +283,3 @@ rm -f %{buildroot}%{_docdir}/claws-mail/tools/Makefile* %doc src/plugins/trayicon/README %{_libdir}/%{name}/plugins/trayicon.so - -%changelog -* Thu Jul 19 2012 Andrey Bondrov 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 1:3.8.1-2 -+ Revision: 810130 -- Add requires exceptions and fix unversioned obsoletes issue - -* Wed Jul 11 2012 Tomasz Pawel Gajc 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 1:3.8.0-1 -+ Revision: 743401 -- New version 3.8.0, minor spec cleanups - -* Tue Nov 08 2011 Andrey Bondrov 1:3.7.10-3 -+ Revision: 729070 -- Add patch0 to fix new glib issues - -* Fri Sep 23 2011 Tomasz Pawel Gajc 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 - - oops - - cleaned up spec - rebuild for libetpan - removed devel reqs for devel pkg, not needed - -* Mon May 23 2011 Funda Wang 1:3.7.9-2 -+ Revision: 677607 -- update multiarch usage -- add upstream patch to fix bug#2414 - -* Sun Apr 10 2011 Funda Wang 1:3.7.9-1 -+ Revision: 652231 -- patch not needed -- new version 3.7.9 - -* Mon Dec 06 2010 Sandro Cazzaniga 1:3.7.8-1mdv2011.0 -+ Revision: 612409 -- update to 3.7.8 -- fix install - -* Thu Jul 15 2010 Tomasz Pawel Gajc 1:3.7.6-1mdv2011.0 -+ Revision: 553660 -- update to new version 3.7.6 - -* Sun Jan 31 2010 Frederik Himpe 1:3.7.5-1mdv2010.1 -+ Revision: 498895 -- update to new version 3.7.5 - -* Fri Jan 15 2010 Colin Leroy 1:3.7.4-1mdv2010.1 -+ Revision: 491622 -- New upstream release - -* Fri Oct 09 2009 Colin Leroy 1:3.7.3-1mdv2010.1 -+ Revision: 456254 -- Fix tarball -- New upstream release - -* Mon Oct 05 2009 Colin Leroy 1:3.7.2-2mdv2010.0 -+ Revision: 453854 -- Fix bug 54024, "Claws-Mail 3.7.2 doesn't refresh" - Patch from upstream 3.7.2cvs42. - -* Fri Aug 07 2009 Tomasz Pawel Gajc 1:3.7.2-1mdv2010.0 -+ Revision: 411306 -- add buildrequires on libtool -- export path to libtool, just to make it compile -- use _disable_ld_no_undefined 1 as a workaround - - + Colin Leroy - - New upstream release - -* Fri Mar 06 2009 Colin Leroy 1:3.7.1-1mdv2009.1 -+ Revision: 349651 -- Update to 3.7.1 - -* Fri Dec 19 2008 Colin Leroy 1:3.7.0-1mdv2009.1 -+ Revision: 316128 -- Prepare new release -- Fix spellchecker - - + Oden Eriksson - - lowercase ImageMagick - -* Fri Oct 10 2008 Tomasz Pawel Gajc 1:3.6.1-1mdv2009.1 -+ Revision: 291580 -- update to new version 3.6.1 -- add buildrequires on enchant - -* Fri Oct 03 2008 Colin Leroy 1:3.6.0-1mdv2009.0 -+ Revision: 290998 -- * SOURCES/claws-mail-3.6.0.tar.bz2, - SPECS/claws-mail.spec: - New upstream release - * SOURCES/claws-mail-3.5.0-gnutls-rootcerts-path.patch, - SOURCES/claws-mail-3.5.0-gtk+2.13.x.patch: - Dropped (fixed upstream) - -* Sun Sep 07 2008 Tomasz Pawel Gajc 1:3.5.0-6mdv2009.0 -+ Revision: 282370 -- Patch2: fix compiling with gtk+-2.13.x and newer -- Patch1: fix it -- Patch1: add path to rootcers if compiled with gnutls support -- add requires for rootcerts -- disable openssl in confgure options - -* Sat Jun 28 2008 Tomasz Pawel Gajc 1:3.5.0-5mdv2009.0 -+ Revision: 229678 -- add requires on gnutls-devel for devel subpackage since support for gnutls has been enabled - -* Sat Jun 28 2008 Tomasz Pawel Gajc 1:3.5.0-4mdv2009.0 -+ Revision: 229663 -- obsolete claws-mail-pdf_viewer-plugin -- add missing buildrequires on bison, flex, startup-notification-devel, gnutls-devel and valgrind -- explicitly disable network-manager support - -* Fri Jun 27 2008 Colin Leroy 1:3.5.0-3mdv2009.0 -+ Revision: 229512 -- A requested package cannot be installed: - lib64nm_util-devel-0.7.0-0.3675.1mdv2009.0.x86_64 (due to unsatisfied devel(libnspr4(64bit))) -- Use new NM package names - -* Fri Jun 27 2008 Colin Leroy 1:3.5.0-2mdv2009.0 -+ Revision: 229510 -- Disable NetworkManager support (broken NM packages) -- New upstream release - - + Pixel - - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas - -* Fri Apr 18 2008 Colin Leroy 1:3.4.0-3mdv2009.0 -+ Revision: 195677 -- Force rebuild -- Signal that the clamav plugin is dead - -* Fri Apr 18 2008 Colin Leroy 1:3.4.0-1mdv2009.0 -+ Revision: 195588 -- New upstream release - -* Fri Mar 28 2008 Colin Leroy 1:3.3.1-2mdv2008.1 -+ Revision: 190872 -- Backport fixes from upstream CVS: - (3.3.1cvs5) Fix bug 1534, 'Segmentation fault when doing - some draft saving and then throwing away' - (3.3.1cvs5) Fix bug 1533, 'Claws is unable to mark messages - as "read" in IMAP shared folders' - (3.3.1cvs5) Fix bug 1515, 'large messages crash claws when - syncing for offline mode'. This is rather a - workaround, and mails > 64MB will still be - problematic if there's less than 64MB available - on the dataroot volume. - (3.3.1cvs7) Probably fix bug 1539, 'Program crashes': - Setup Gcrypt's thread functions when built - with GnuTLS - (3.3.1cvs19) Fix blinking of the taskbar entry - (3.3.1cvs23) Fix folderview's scrollbar at startup - if starting hidden - (3.3.1cvs24) Fix buglet on setting recipient when - reediting forward rules. - (3.3.1cvs30) Remove raw printf - (3.3.1cvs32) Sanity check. - (3.3.1cvs36) strstrip mime subtype - (3.3.1cvs39) Fix bug 1555: current folder wasn't used when - right-clicking on an email address - (3.3.1cvs40) Clean up session disconnection. Possibly - fix Ubuntu bug #204290 - (3.3.1cvs41+42) Prevent list flickering when deleting addresses. - (3.3.1cvs43) Fix bug 1559, 'Claws Mail crashed deleting all - common contacts' - (3.3.1cvs44) Fix RedHat bug 431735, 'segfault if /home is full' - (when starting): Fix double fclose() in prefs.c - and potentially xmlprops.c - -* Sun Feb 24 2008 Colin Leroy 1:3.3.1-1mdv2008.1 -+ Revision: 174263 -- New upstream release 3.3.1 - -* Fri Feb 08 2008 Colin Leroy 1:3.3.0-2mdv2008.1 -+ Revision: 164141 -- Upgrade to 3.3.0 - - + Olivier Blin - - restore BuildRoot - -* Sun Dec 30 2007 Tomasz Pawel Gajc 1:3.2.0-2mdv2008.1 -+ Revision: 139433 -- rebuild for libetpan and bogofilter - - + Colin Leroy - - Put back buildroot, or "make DESTDIR= install" fails - - ImageMagick *was* required - -Remove useless imagemagick builddep - -Use compface only on > 2008.0 - -* Wed Dec 19 2007 Tomasz Pawel Gajc 1:3.2.0-1mdv2008.1 -+ Revision: 133264 -- spec file clean -- do not package COPYING file -- remove big ChangeLog files and INSTALL file - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - - + Colin Leroy - - New 3.2.0 upstream release - -* Sun Dec 02 2007 Funda Wang 1:3.1.0-3mdv2008.1 -+ Revision: 114365 -- add desktop file patch - -* Mon Nov 19 2007 Colin Leroy 1:3.1.0-2mdv2008.1 -+ Revision: 110480 -- Increment rel -- Remove wrong dependancy - -* Mon Nov 19 2007 Colin Leroy 1:3.1.0-1mdv2008.1 -+ Revision: 110412 -- Fix virtual dependancy -- Add missing BuildDepends -- Update Claws Mail's spec to 3.1.0 -- libgnomeprintui is not a dependancy anymore, the internal - GTK+ print support is used with GTK+ >= 2.10 - - + Tomasz Pawel Gajc - - add requires on compface - -* Fri Oct 26 2007 Tomasz Pawel Gajc 1:3.0.2-2mdv2008.1 -+ Revision: 102417 -- update descriptions for plugins -- fix mixture of tabs and spaces -- enable compface -- disable static libraries -- nuke rpath -- remove old non fd.o icons dir -- fix desktop entries -- add scriplets -- spec file clean - -* Tue Oct 02 2007 Colin Leroy 1:3.0.2-1mdv2008.0 -+ Revision: 94597 -- Upgrade to 3.0.2 (bugfixes only) - -* Thu Sep 20 2007 Colin Leroy 1:3.0.1-1mdv2008.0 -+ Revision: 91383 -- Fix Summary - - + Jérôme Soyer - - Fix - - + Funda Wang - - GPLv3+ now - -* Tue Sep 04 2007 Funda Wang 1:3.0.0-1mdv2008.0 -+ Revision: 78965 -- BR clamav-devel -- New version 3.0.0 - -* Sat Jul 14 2007 Jérôme Soyer 1:2.10.0-1mdv2008.0 -+ Revision: 52039 -- New release 2.10.0 - -* Wed May 09 2007 Jérôme Soyer 1:2.9.2-1mdv2008.0 -+ Revision: 25795 -- New release 2.9.2 - -* Thu Apr 19 2007 Jérôme Soyer 1:2.9.1-1mdv2008.0 -+ Revision: 14935 -- New release 2.9.1 - -* Tue Apr 17 2007 Jérôme Soyer 1:2.9.0-1mdv2008.0 -+ Revision: 13566 -- New release 2.9.0 - - -* Tue Mar 06 2007 Jérôme Soyer 2.8.1-1mdv2007.0 -+ Revision: 133885 -- New release 2.8.1 - -* Tue Feb 27 2007 Jérôme Soyer 1:2.8.0-3mdv2007.1 -+ Revision: 126233 -- Final Release - -* Wed Feb 21 2007 Jérôme Soyer 1:2.8.0-2mdv2007.1 -+ Revision: 123182 -- Bump Release -- New release 2.8.0-rc2 - -* Thu Feb 15 2007 Jérôme Soyer 1:2.8.0-1mdv2007.1 -+ Revision: 121504 -- New release 2.8.0rc1 - -* Fri Jan 26 2007 Jérôme Soyer 1:2.7.2-1mdv2007.1 -+ Revision: 114223 -- New release 2.7.2 - -* Thu Jan 18 2007 Jérôme Soyer 1:2.7.1-1mdv2007.1 -+ Revision: 110276 -- Ready to build -- Add BR, bump release - - + Nicolas Lécureuil - - Add a buildrequire - -* Wed Jan 10 2007 Jérôme Soyer 1:2.7.0-1mdv2007.1 -+ Revision: 107072 -- Fix changes -- Fix %%files -- New release 2.7.0 - - + Nicolas Lécureuil - - Macroise a little more - -* Sat Jan 06 2007 Jérôme Soyer 1:2.6.1-1mdv2007.1 -+ Revision: 104872 -- Add changes for building with iurt -- Import claws-mail -