From d841115b5f3443630cb579a152d0808eb1c0cc51 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Jul 10 2008 17:53:29 +0000 Subject: Update to 0.75. --- diff --git a/.cvsignore b/.cvsignore index c0a4e97..012d2f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -cone-0.74.tar.bz2 -cone-0.74.tar.bz2.sig +cone-0.75.tar.bz2 +cone-0.75.tar.bz2.sig diff --git a/cone-gcc43.patch b/cone-gcc43.patch deleted file mode 100644 index 939e9d1..0000000 --- a/cone-gcc43.patch +++ /dev/null @@ -1,218 +0,0 @@ -diff -up cone-0.74/cone/nntpcommand.C.gcc43 cone-0.74/cone/nntpcommand.C ---- cone-0.74/cone/nntpcommand.C.gcc43 2008-03-28 23:58:51.000000000 -0400 -+++ cone-0.74/cone/nntpcommand.C 2008-03-28 23:59:10.000000000 -0400 -@@ -9,9 +9,10 @@ - #include "nntpcommand.H" - #include "libmail/addmessage.H" - #include "gettext.H" --#include --#include -+#include -+#include - #include -+#include - - #include - #if HAVE_UNISTD_H -diff -up cone-0.74/cone/tags.C.gcc43 cone-0.74/cone/tags.C ---- cone-0.74/cone/tags.C.gcc43 2008-03-28 23:59:32.000000000 -0400 -+++ cone-0.74/cone/tags.C 2008-03-28 23:59:44.000000000 -0400 -@@ -9,6 +9,7 @@ - #include "tags.H" - #include "gettext.H" - #include -+#include - - using namespace std; - -diff -up cone-0.74/cone/spellcheckerAspell.C.gcc43 cone-0.74/cone/spellcheckerAspell.C ---- cone-0.74/cone/spellcheckerAspell.C.gcc43 2008-03-29 00:00:31.000000000 -0400 -+++ cone-0.74/cone/spellcheckerAspell.C 2008-03-29 00:00:49.000000000 -0400 -@@ -9,7 +9,8 @@ - #include "spellcheckerAspell.H" - #include "libmail/mail.H" - --#include -+#include -+#include - - #if HAVE_ASPELL_CONFIG_HH - #include "aspell/suggest.hh" -diff -up cone-0.74/cone/gettext.C.gcc43 cone-0.74/cone/gettext.C ---- cone-0.74/cone/gettext.C.gcc43 2008-03-28 23:57:20.000000000 -0400 -+++ cone-0.74/cone/gettext.C 2008-03-28 23:57:49.000000000 -0400 -@@ -6,14 +6,15 @@ - */ - - #include "gettext.H" --#include --#include -+#include -+#include - #include - #include - #include - #include "unicode/unicode.h" - #include "libmail/mail.H" --#include -+#include -+#include - - #if HAVE_LANGINFO_H - #include -diff -up cone-0.74/cone/spellcheckerPspell.C.gcc43 cone-0.74/cone/spellcheckerPspell.C ---- cone-0.74/cone/spellcheckerPspell.C.gcc43 2008-03-29 00:00:00.000000000 -0400 -+++ cone-0.74/cone/spellcheckerPspell.C 2008-03-29 00:00:15.000000000 -0400 -@@ -9,7 +9,8 @@ - #include "spellcheckerPspell.H" - #include "libmail/mail.H" - --#include -+#include -+#include - - using namespace std; - -diff -up cone-0.74/libmail/attachments.C.gcc43 cone-0.74/libmail/attachments.C ---- cone-0.74/libmail/attachments.C.gcc43 2008-03-28 23:46:09.000000000 -0400 -+++ cone-0.74/libmail/attachments.C 2008-03-29 00:02:57.000000000 -0400 -@@ -11,10 +11,11 @@ - #include "rfc2045/rfc2045charset.h" - #include - #include "attachments.H" --#include --#include -+#include -+#include -+#include - #include --#include -+#include - #include - #include - -diff -up cone-0.74/libmail/fd.C.gcc43 cone-0.74/libmail/fd.C ---- cone-0.74/libmail/fd.C.gcc43 2008-03-28 23:47:28.000000000 -0400 -+++ cone-0.74/libmail/fd.C 2008-03-28 23:47:57.000000000 -0400 -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - using namespace std; - -diff -up cone-0.74/libmail/mimetypes.C.gcc43 cone-0.74/libmail/mimetypes.C ---- cone-0.74/libmail/mimetypes.C.gcc43 2008-03-28 23:50:35.000000000 -0400 -+++ cone-0.74/libmail/mimetypes.C 2008-03-28 23:51:28.000000000 -0400 -@@ -8,7 +8,8 @@ - #include "mimetypes.H" - #include "namespace.H" - #include --#include -+#include -+#include - - using namespace std; - -diff -up cone-0.74/libmail/addmessageimport.C.gcc43 cone-0.74/libmail/addmessageimport.C ---- cone-0.74/libmail/addmessageimport.C.gcc43 2008-03-28 23:43:31.000000000 -0400 -+++ cone-0.74/libmail/addmessageimport.C 2008-03-29 00:03:19.000000000 -0400 -@@ -7,7 +7,8 @@ - #include "libmail_config.h" - #include "addmessage.H" - #include "attachments.H" --#include -+#include -+#include - - using namespace std; - -diff -up cone-0.74/libmail/addressbookadd.C.gcc43 cone-0.74/libmail/addressbookadd.C ---- cone-0.74/libmail/addressbookadd.C.gcc43 2008-03-28 23:45:33.000000000 -0400 -+++ cone-0.74/libmail/addressbookadd.C 2008-03-29 00:04:00.000000000 -0400 -@@ -13,9 +13,10 @@ - #include "rfcaddr.H" - #include "misc.H" - #include "unicode/unicode.h" --#include -+#include - #include --#include -+#include -+#include - - using namespace std; - -diff -up cone-0.74/libmail/rfc2047decode.C.gcc43 cone-0.74/libmail/rfc2047decode.C ---- cone-0.74/libmail/rfc2047decode.C.gcc43 2008-03-28 23:52:50.000000000 -0400 -+++ cone-0.74/libmail/rfc2047decode.C 2008-03-28 23:53:00.000000000 -0400 -@@ -9,6 +9,7 @@ - #include "rfc2047decode.H" - #include "rfc822/rfc2047.h" - #include "mail.H" -+#include - - using namespace std; - -diff -up cone-0.74/libmail/addmessageremoveattachments.C.gcc43 cone-0.74/libmail/addmessageremoveattachments.C ---- cone-0.74/libmail/addmessageremoveattachments.C.gcc43 2008-03-28 23:44:28.000000000 -0400 -+++ cone-0.74/libmail/addmessageremoveattachments.C 2008-03-29 00:04:43.000000000 -0400 -@@ -8,7 +8,8 @@ - #include "addmessage.H" - #include "attachments.H" - #include "headers.H" --#include -+#include -+#include - #include - - using namespace std; -diff -up cone-0.74/libmail/sortfolders.C.gcc43 cone-0.74/libmail/sortfolders.C ---- cone-0.74/libmail/sortfolders.C.gcc43 2008-03-28 23:55:00.000000000 -0400 -+++ cone-0.74/libmail/sortfolders.C 2008-03-28 23:55:11.000000000 -0400 -@@ -6,6 +6,7 @@ - */ - #include "libmail_config.h" - #include "mail.H" -+#include - - mail::folder::sort::sort(bool foldersFirstArg) // TRUE: sort folders first - : foldersFirst(foldersFirstArg) -diff -up cone-0.74/libmail/addressbook.C.gcc43 cone-0.74/libmail/addressbook.C ---- cone-0.74/libmail/addressbook.C.gcc43 2008-03-28 23:45:00.000000000 -0400 -+++ cone-0.74/libmail/addressbook.C 2008-03-29 00:05:01.000000000 -0400 -@@ -13,7 +13,8 @@ - #include "addressbooksearch.H" - #include "rfc2047decode.H" - #include "misc.H" --#include -+#include -+#include - - using namespace std; - -diff -up cone-0.74/libmail/fdtls.C.gcc43 cone-0.74/libmail/fdtls.C ---- cone-0.74/libmail/fdtls.C.gcc43 2008-03-28 23:48:21.000000000 -0400 -+++ cone-0.74/libmail/fdtls.C 2008-03-28 23:48:32.000000000 -0400 -@@ -6,6 +6,7 @@ - */ - #include "libmail_config.h" - #include "fdtls.H" -+#include - - #if HAVE_LIBCOURIERTLS - -diff -up cone-0.74/libmail/addmessage.C.gcc43 cone-0.74/libmail/addmessage.C ---- cone-0.74/libmail/addmessage.C.gcc43 2004-06-22 20:55:25.000000000 -0400 -+++ cone-0.74/libmail/addmessage.C 2008-03-29 00:05:15.000000000 -0400 -@@ -7,7 +7,8 @@ - #include "libmail_config.h" - #include "addmessage.H" - #include "attachments.H" --#include -+#include -+#include - - // Default method implementation. - diff --git a/cone.spec b/cone.spec index dd0c9a6..68fb051 100644 --- a/cone.spec +++ b/cone.spec @@ -2,8 +2,8 @@ Summary: CONE mail reader Name: cone -Version: 0.74 -Release: 3%{?dist} +Version: 0.75 +Release: 1%{?dist} URL: http://www.courier-mta.org/cone/ Source0: http://dl.sf.net/courier/%{name}-%{version}.tar.bz2 @@ -23,8 +23,6 @@ BuildRequires: procps Requires(post): %{__perl} -Patch1: cone-gcc43.patch - %description CONE is a simple, text-based E-mail reader and writer. @@ -47,7 +45,6 @@ contains a large amount of documentation for CONE. %prep %setup -q -%patch1 -p1 -b .gcc43 %build CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}" @@ -107,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %doc cone/html %changelog +* Thu Jul 10 2008 Steven Pritchard 0.75-1 +- Update to 0.75. + * Sat Mar 29 2008 Christopher Aillon - 0.74-3 - Add compilation patch for GCC 4.3; add proper C++ #includes diff --git a/sources b/sources index 9868010..79b443b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -59ec5a486d5a5c358fc0f9531dbe2c02 cone-0.74.tar.bz2 -81431521db8fad2d4177ba05586251ec cone-0.74.tar.bz2.sig +cdc4c9dbdda1567601cd8fed1c9fbd96 cone-0.75.tar.bz2 +2f392d84b84ba43faaeea336ddfa6905 cone-0.75.tar.bz2.sig