From cf254faf92d9cea4dededed2b08d64a40d571a29 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Jan 2013 09:13:29 +0000 Subject: [PATCH 1/5] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=84 --- mutt-1.5.21.sidebar.20120829.patch | 1 - mutt.changes | 6 ++++++ mutt.spec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mutt-1.5.21.sidebar.20120829.patch b/mutt-1.5.21.sidebar.20120829.patch index 22589ad..1b0708f 100644 --- a/mutt-1.5.21.sidebar.20120829.patch +++ b/mutt-1.5.21.sidebar.20120829.patch @@ -1487,7 +1487,6 @@ if (ctx->mx_close) ctx->mx_close (ctx); - @@ -755,6 +755,8 @@ mutt_clear_threads (ctx); for (i = 0; i < ctx->msgcount; i++) diff --git a/mutt.changes b/mutt.changes index f3586f9..421a042 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 14 09:11:05 UTC 2013 - werner@suse.de + +- Remove spurious blank line from new patch to make older patch(1) + also work with this + ------------------------------------------------------------------- Tue Dec 18 16:26:45 UTC 2012 - aginies@suse.com diff --git a/mutt.spec b/mutt.spec index 012787a..298fc12 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From d85870d123e84322681bb2cc0432d9156433ae7d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Jan 2013 09:44:14 +0000 Subject: [PATCH 2/5] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=85 --- mutt-1.5.21.sidebar.20120829.patch | 532 +++++++++++++++-------------- mutt.spec | 2 +- 2 files changed, 269 insertions(+), 265 deletions(-) diff --git a/mutt-1.5.21.sidebar.20120829.patch b/mutt-1.5.21.sidebar.20120829.patch index 1b0708f..445e574 100644 --- a/mutt-1.5.21.sidebar.20120829.patch +++ b/mutt-1.5.21.sidebar.20120829.patch @@ -1,6 +1,6 @@ -*** mutt-1.5.21-orig/buffy.c 2010-09-13 12:19:55.000000000 -0500 ---- mutt-1.5.21/buffy.c 2012-08-29 12:12:22.000000000 -0500 -*************** +*** mutt-1.5.21/buffy.c +--- mutt-1.5.21/buffy.c Wed Aug 29 17:12:22 2012 +*************** void mutt_buffy_cleanup (const char *buf *** 161,166 **** --- 161,209 ---- } @@ -52,7 +52,7 @@ BUFFY *mutt_find_mailbox (const char *path) { BUFFY *tmp = NULL; -*************** +*************** void mutt_update_mailbox (BUFFY * b) *** 196,204 **** --- 239,251 ---- static BUFFY *buffy_new (const char *path) @@ -68,7 +68,7 @@ buffy->next = NULL; buffy->magic = 0; -*************** +*************** int mutt_parse_mailboxes (BUFFER *path, *** 243,250 **** p = realpath (buf, f1); for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next)) @@ -87,7 +87,7 @@ { dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path)); break; -*************** +*************** int mutt_parse_mailboxes (BUFFER *path, *** 282,287 **** --- 329,335 ---- else @@ -97,7 +97,7 @@ return 0; } -*************** +*************** static int buffy_maildir_hasnew (BUFFY* *** 306,311 **** --- 354,364 ---- return 0; @@ -111,7 +111,7 @@ if ((dirp = opendir (path)) == NULL) { mailbox->magic = 0; -*************** +*************** static int buffy_maildir_hasnew (BUFFY* *** 340,345 **** --- 393,464 ---- return rc; @@ -186,7 +186,7 @@ /* returns 1 if mailbox has new mail */ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) { -*************** +*************** static int buffy_mbox_hasnew (BUFFY* mai *** 351,357 **** else statcheck = sb->st_mtime > sb->st_atime @@ -203,7 +203,7 @@ { if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) { -*************** +*************** static int buffy_mbox_hasnew (BUFFY* mai *** 371,376 **** --- 490,516 ---- return rc; @@ -233,7 +233,7 @@ int mutt_buffy_check (int force) { BUFFY *tmp; -*************** +*************** int mutt_buffy_check (int force) *** 444,459 **** --- 584,602 ---- { @@ -255,8 +255,8 @@ if ((tmp->new = mh_buffy (tmp->path)) > 0) BuffyCount++; break; -*** mutt-1.5.21-orig/buffy.h 2010-09-13 12:19:55.000000000 -0500 ---- mutt-1.5.21/buffy.h 2012-08-29 12:11:20.000000000 -0500 +*** mutt-1.5.21/buffy.h +--- mutt-1.5.21/buffy.h Wed Aug 29 17:11:20 2012 *************** *** 23,35 **** --- 23,41 ---- @@ -279,9 +279,9 @@ } BUFFY; -*** mutt-1.5.21-orig/color.c 2009-05-15 12:18:23.000000000 -0500 ---- mutt-1.5.21/color.c 2012-08-29 11:25:04.000000000 -0500 -*************** +*** mutt-1.5.21/color.c +--- mutt-1.5.21/color.c Wed Aug 29 16:25:04 2012 +*************** static struct mapping_t Fields[] = *** 93,98 **** --- 93,100 ---- { "bold", MT_COLOR_BOLD }, @@ -292,9 +292,9 @@ { NULL, 0 } }; -*** mutt-1.5.21-orig/compose.c 2010-04-14 13:50:19.000000000 -0500 ---- mutt-1.5.21/compose.c 2012-08-29 11:25:04.000000000 -0500 -*************** +*** mutt-1.5.21/compose.c +--- mutt-1.5.21/compose.c Wed Aug 29 16:25:04 2012 +*************** enum *** 72,78 **** #define HDR_XOFFSET 10 @@ -311,7 +311,7 @@ static char *Prompts[] = { -*************** +*************** static void redraw_crypt_lines (HEADER * *** 112,118 **** { int off = 0; @@ -328,7 +328,7 @@ if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) { -*************** +*************** static void redraw_crypt_lines (HEADER * *** 144,150 **** } @@ -345,7 +345,7 @@ clrtoeol (); if ((WithCrypto & APPLICATION_PGP) -*************** +*************** static void redraw_crypt_lines (HEADER * *** 161,167 **** && (msg->security & ENCRYPT) && SmimeCryptAlg @@ -362,7 +362,7 @@ NONULL(SmimeCryptAlg)); off = 20; } -*************** +*************** static void redraw_mix_line (LIST *chain *** 175,181 **** int c; char *t; @@ -379,7 +379,7 @@ if (!chain) { -*************** +*************** static void redraw_mix_line (LIST *chain *** 190,196 **** if (t && t[0] == '0' && t[1] == '\0') t = ""; @@ -396,7 +396,7 @@ break; addstr (NONULL(t)); -*************** +*************** static void draw_envelope_addr (int line *** 242,248 **** buf[0] = 0; @@ -413,7 +413,7 @@ mutt_paddstr (W, buf); } -*************** +*************** static void draw_envelope (HEADER *msg, *** 252,261 **** draw_envelope_addr (HDR_TO, msg->env->to); draw_envelope_addr (HDR_CC, msg->env->cc); @@ -436,7 +436,7 @@ mutt_paddstr (W, fcc); if (WithCrypto) -*************** +*************** static void draw_envelope (HEADER *msg, *** 266,272 **** #endif @@ -453,7 +453,7 @@ BKGDSET (MT_COLOR_STATUS); clrtoeol (); -*************** +*************** static int edit_address_list (int line, *** 304,310 **** /* redraw the expanded list so the user can see the result */ buf[0] = 0; @@ -470,7 +470,7 @@ mutt_paddstr (W, buf); return 0; -*************** +*************** int mutt_compose_menu (HEADER *msg, /* *** 549,555 **** if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { @@ -487,7 +487,7 @@ clrtoeol (); if (msg->env->subject) mutt_paddstr (W, msg->env->subject); -*************** +*************** int mutt_compose_menu (HEADER *msg, /* *** 566,572 **** { strfcpy (fcc, buf, fcclen); @@ -504,11 +504,11 @@ mutt_paddstr (W, fcc); fccSet = 1; } -*** mutt-1.5.21-orig/configure.ac 2010-08-24 11:34:21.000000000 -0500 ---- mutt-1.5.21/configure.ac 2012-08-29 12:10:31.000000000 -0500 -*************** -*** 1289,1294 **** ---- 1289,1296 ---- +*** mutt-1.5.21/configure.ac +--- mutt-1.5.21/configure.ac Wed Aug 29 17:10:31 2012 +*************** if test $mutt_cv_langinfo_yesexpr = yes; +*** 1302,1307 **** +--- 1302,1309 ---- AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have and nl_langinfo(YESEXPR). ]) fi @@ -517,8 +517,8 @@ dnl Documentation tools have_openjade="no" AC_PATH_PROG([OSPCAT], [ospcat], [none]) -*** mutt-1.5.21-orig/curs_main.c 2010-09-13 12:19:55.000000000 -0500 ---- mutt-1.5.21/curs_main.c 2012-08-29 12:08:10.000000000 -0500 +*** mutt-1.5.21/curs_main.c +--- mutt-1.5.21/curs_main.c Wed Aug 29 17:08:10 2012 *************** *** 26,32 **** --- 26,34 ---- @@ -531,8 +531,8 @@ #ifdef USE_POP #include "pop.h" -*************** -*** 519,538 **** +*************** int mutt_index_menu (void) +*** 532,551 **** menu->redraw |= REDRAW_STATUS; if (do_buffy_notify) { @@ -553,7 +553,7 @@ } if (menu->menu == MENU_MAIN) ---- 521,551 ---- +--- 534,564 ---- menu->redraw |= REDRAW_STATUS; if (do_buffy_notify) { @@ -585,9 +585,9 @@ } if (menu->menu == MENU_MAIN) -*************** -*** 554,563 **** ---- 567,579 ---- +*************** int mutt_index_menu (void) +*** 567,576 **** +--- 580,592 ---- if (menu->redraw & REDRAW_STATUS) { @@ -601,8 +601,8 @@ mutt_paddstr (COLS, buf); SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -*************** -*** 571,577 **** +*************** int mutt_index_menu (void) +*** 591,597 **** menu->oldcurrent = -1; if (option (OPTARROWCURSOR)) @@ -610,7 +610,7 @@ else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else ---- 587,593 ---- +--- 607,613 ---- menu->oldcurrent = -1; if (option (OPTARROWCURSOR)) @@ -618,9 +618,9 @@ else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else -*************** -*** 1069,1074 **** ---- 1085,1091 ---- +*************** int mutt_index_menu (void) +*** 1089,1094 **** +--- 1105,1111 ---- menu->redraw = REDRAW_FULL; break; @@ -628,8 +628,8 @@ case OP_MAIN_CHANGE_FOLDER: case OP_MAIN_NEXT_UNREAD_MAILBOX: -*************** -*** 1100,1106 **** +*************** int mutt_index_menu (void) +*** 1120,1126 **** { mutt_buffy (buf, sizeof (buf)); @@ -637,7 +637,7 @@ { if (menu->menu == MENU_PAGER) { ---- 1117,1127 ---- +--- 1137,1147 ---- { mutt_buffy (buf, sizeof (buf)); @@ -649,9 +649,9 @@ { if (menu->menu == MENU_PAGER) { -*************** -*** 1118,1123 **** ---- 1139,1145 ---- +*************** int mutt_index_menu (void) +*** 1138,1143 **** +--- 1159,1165 ---- } mutt_expand_path (buf, sizeof (buf)); @@ -659,9 +659,9 @@ if (mx_get_magic (buf) <= 0) { mutt_error (_("%s is not a mailbox."), buf); -*************** -*** 2208,2213 **** ---- 2230,2241 ---- +*************** int mutt_index_menu (void) +*** 2233,2238 **** +--- 2255,2266 ---- mutt_what_key(); break; @@ -674,8 +674,8 @@ default: if (menu->menu == MENU_MAIN) km_error_key (MENU_MAIN); -*** mutt-1.5.21-orig/flags.c 2009-01-03 17:27:10.000000000 -0600 ---- mutt-1.5.21/flags.c 2012-08-29 11:25:04.000000000 -0500 +*** mutt-1.5.21/flags.c +--- mutt-1.5.21/flags.c Wed Aug 29 16:25:04 2012 *************** *** 22,29 **** --- 22,31 ---- @@ -689,7 +689,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx) { -*************** +*************** void _mutt_set_flag (CONTEXT *ctx, HEADE *** 263,268 **** --- 265,271 ---- */ @@ -699,9 +699,9 @@ } void mutt_tag_set_flag (int flag, int bf) -*** mutt-1.5.21-orig/functions.h 2010-08-24 11:34:21.000000000 -0500 ---- mutt-1.5.21/functions.h 2012-08-29 11:25:04.000000000 -0500 -*************** +*** mutt-1.5.21/functions.h +--- mutt-1.5.21/functions.h Wed Aug 29 16:25:04 2012 +*************** struct binding_t OpMain[] = { /* map: in *** 169,174 **** --- 169,179 ---- { "decrypt-save", OP_DECRYPT_SAVE, NULL }, @@ -715,7 +715,7 @@ { NULL, 0, NULL } }; -*************** +*************** struct binding_t OpPager[] = { /* map: p *** 272,277 **** --- 277,287 ---- @@ -729,9 +729,9 @@ { NULL, 0, NULL } }; -*** mutt-1.5.21-orig/globals.h 2009-08-25 14:08:52.000000000 -0500 ---- mutt-1.5.21/globals.h 2012-08-29 12:09:02.000000000 -0500 -*************** +*** mutt-1.5.21/globals.h +--- mutt-1.5.21/globals.h Wed Aug 29 17:09:02 2012 +*************** WHERE short SearchContext; *** 117,122 **** --- 117,124 ---- WHERE char *SendCharset; @@ -742,9 +742,9 @@ WHERE char *Signature; WHERE char *SimpleSearch; #if USE_SMTP -*************** -*** 207,212 **** ---- 209,217 ---- +*************** WHERE short ScoreThresholdDelete; +*** 209,214 **** +--- 211,219 ---- WHERE short ScoreThresholdRead; WHERE short ScoreThresholdFlag; @@ -754,9 +754,9 @@ #ifdef USE_IMAP WHERE short ImapKeepalive; WHERE short ImapPipelineDepth; -*** mutt-1.5.21-orig/handler.c 2009-08-25 14:08:52.000000000 -0500 ---- mutt-1.5.21/handler.c 2012-08-29 12:10:31.000000000 -0500 -*************** +*** mutt-1.5.21/handler.c +--- mutt-1.5.21/handler.c Wed Aug 29 17:10:31 2012 +*************** int mutt_body_handler (BODY *b, STATE *s *** 1525,1530 **** --- 1525,1535 ---- char type[STRING]; @@ -770,7 +770,7 @@ int oflags = s->flags; /* first determine which handler to use to process this part */ -*************** +*************** int mutt_body_handler (BODY *b, STATE *s *** 1644,1649 **** --- 1649,1662 ---- { @@ -787,7 +787,7 @@ mutt_mktemp (tempfile, sizeof (tempfile)); if ((s->fpout = safe_fopen (tempfile, "w")) == NULL) { -*************** +*************** int mutt_body_handler (BODY *b, STATE *s *** 1651,1656 **** --- 1664,1670 ---- dprint (1, (debugfile, "Can't open %s.\n", tempfile)); @@ -797,7 +797,7 @@ /* decoding the attachment changes the size and offset, so save a copy * of the "real" values now, and restore them after processing */ -*************** +*************** int mutt_body_handler (BODY *b, STATE *s *** 1679,1686 **** --- 1693,1711 ---- /* restore final destination and substitute the tempfile for input */ @@ -819,7 +819,7 @@ /* restore the prefix */ s->prefix = savePrefix; -*************** +*************** int mutt_body_handler (BODY *b, STATE *s *** 1706,1711 **** --- 1731,1740 ---- @@ -832,11 +832,11 @@ s->fpin = fp; } } -*** mutt-1.5.21-orig/init.h 2010-09-15 10:39:31.000000000 -0500 ---- mutt-1.5.21/init.h 2012-08-29 12:09:48.000000000 -0500 -*************** -*** 1953,1958 **** ---- 1953,2000 ---- +*** mutt-1.5.21/init.h +--- mutt-1.5.21/init.h Wed Aug 29 17:09:48 2012 +*************** struct option_t MuttVars[] = { +*** 1955,1960 **** +--- 1955,2002 ---- ** not used. ** (PGP only) */ @@ -885,8 +885,8 @@ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, /* ** .pp -*** mutt-1.5.21-orig/mailbox.h 2009-04-30 12:33:48.000000000 -0500 ---- mutt-1.5.21/mailbox.h 2012-08-29 11:25:04.000000000 -0500 +*** mutt-1.5.21/mailbox.h +--- mutt-1.5.21/mailbox.h Wed Aug 29 16:25:04 2012 *************** *** 27,32 **** --- 27,33 ---- @@ -897,8 +897,8 @@ /* mx_open_new_message() */ #define M_ADD_FROM 1 /* add a From_ line */ -*** mutt-1.5.21-orig/main.c 2010-09-13 12:19:55.000000000 -0500 ---- mutt-1.5.21/main.c 2012-08-29 12:13:28.000000000 -0500 +*** mutt-1.5.21/main.c +--- mutt-1.5.21/main.c Wed Aug 29 17:13:28 2012 *************** *** 50,55 **** --- 50,56 ---- @@ -909,8 +909,8 @@ #include #ifdef HAVE_GETOPT_H -*************** -*** 525,531 **** +*************** init_extended_keys(); +*** 531,537 **** int main (int argc, char **argv) { @@ -918,7 +918,7 @@ char *subject = NULL; char *includeFile = NULL; char *draftFile = NULL; ---- 526,532 ---- +--- 532,538 ---- int main (int argc, char **argv) { @@ -926,9 +926,9 @@ char *subject = NULL; char *includeFile = NULL; char *draftFile = NULL; -*************** -*** 995,1000 **** ---- 996,1008 ---- +*************** int main (int argc, char **argv) +*** 1001,1006 **** +--- 1002,1014 ---- strfcpy (folder, NONULL(Spoolfile), sizeof (folder)); mutt_expand_path (folder, sizeof (folder)); @@ -942,9 +942,9 @@ mutt_str_replace (&CurrentFolder, folder); mutt_str_replace (&LastFolder, folder); -*************** -*** 1017,1022 **** ---- 1025,1031 ---- +*************** int main (int argc, char **argv) +*** 1023,1028 **** +--- 1031,1037 ---- if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL)) || !explicit_folder) { @@ -952,9 +952,9 @@ mutt_index_menu (); if (Context) FREE (&Context); -*** mutt-1.5.21-orig/Makefile.am 2010-08-24 11:34:21.000000000 -0500 ---- mutt-1.5.21/Makefile.am 2012-08-29 11:25:04.000000000 -0500 -*************** +*** mutt-1.5.21/Makefile.am +--- mutt-1.5.21/Makefile.am Wed Aug 29 16:25:04 2012 +*************** mutt_SOURCES = \ *** 32,37 **** --- 32,38 ---- rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ @@ -964,10 +964,10 @@ muttlib.c editmsg.c mbyte.c \ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c -*** mutt-1.5.21-orig/Makefile.in 2010-08-25 11:31:48.000000000 -0500 ---- mutt-1.5.21/Makefile.in 2012-08-29 11:25:04.000000000 -0500 -*************** -*** 85,91 **** +*** mutt-1.5.21/Makefile.in +--- mutt-1.5.21/Makefile.in Wed Aug 29 16:25:04 2012 +*************** am_mutt_OBJECTS = addrbook.$(OBJEXT) ali +*** 86,92 **** system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \ @@ -975,7 +975,7 @@ am__objects_1 = am__objects_2 = patchlist.$(OBJEXT) $(am__objects_1) nodist_mutt_OBJECTS = $(am__objects_2) ---- 85,92 ---- +--- 86,93 ---- system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \ history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \ editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \ @@ -984,8 +984,8 @@ am__objects_1 = am__objects_2 = patchlist.$(OBJEXT) $(am__objects_1) nodist_mutt_OBJECTS = $(am__objects_2) -*************** -*** 359,365 **** +*************** mutt_SOURCES = \ +*** 360,366 **** score.c send.c sendlib.c signal.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ muttlib.c editmsg.c mbyte.c \ @@ -993,7 +993,7 @@ nodist_mutt_SOURCES = $(BUILT_SOURCES) mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ ---- 360,367 ---- +--- 361,368 ---- score.c send.c sendlib.c signal.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ muttlib.c editmsg.c mbyte.c \ @@ -1002,8 +1002,8 @@ nodist_mutt_SOURCES = $(BUILT_SOURCES) mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ -*************** -*** 391,397 **** +*************** EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O +*** 392,398 **** README.SSL smime.h group.h \ muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ ChangeLog mkchangelog.sh mutt_idna.h \ @@ -1011,7 +1011,7 @@ EXTRA_SCRIPTS = smime_keys mutt_dotlock_SOURCES = mutt_dotlock.c ---- 393,399 ---- +--- 394,400 ---- README.SSL smime.h group.h \ muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \ ChangeLog mkchangelog.sh mutt_idna.h \ @@ -1019,11 +1019,11 @@ EXTRA_SCRIPTS = smime_keys mutt_dotlock_SOURCES = mutt_dotlock.c -*** mutt-1.5.21-orig/mbox.c 2010-09-13 12:19:55.000000000 -0500 ---- mutt-1.5.21/mbox.c 2012-08-29 11:25:04.000000000 -0500 -*************** -*** 100,105 **** ---- 100,106 ---- +*** mutt-1.5.21/mbox.c +--- mutt-1.5.21/mbox.c Wed Aug 29 16:25:04 2012 +*************** int mmdf_parse_mailbox (CONTEXT *ctx) +*** 104,109 **** +--- 104,110 ---- mutt_perror (ctx->path); return (-1); } @@ -1031,9 +1031,9 @@ ctx->mtime = sb.st_mtime; ctx->size = sb.st_size; -*************** -*** 251,256 **** ---- 252,258 ---- +*************** int mbox_parse_mailbox (CONTEXT *ctx) +*** 255,260 **** +--- 256,262 ---- ctx->size = sb.st_size; ctx->mtime = sb.st_mtime; @@ -1041,8 +1041,8 @@ #ifdef NFS_ATTRIBUTE_HACK if (sb.st_mtime > sb.st_atime) -*** mutt-1.5.21-orig/menu.c 2010-08-25 11:31:40.000000000 -0500 ---- mutt-1.5.21/menu.c 2012-08-29 11:25:04.000000000 -0500 +*** mutt-1.5.21/menu.c +--- mutt-1.5.21/menu.c Wed Aug 29 16:25:04 2012 *************** *** 24,29 **** --- 24,30 ---- @@ -1053,7 +1053,7 @@ #include #include -*************** +*************** static void menu_pad_string (char *s, si *** 156,162 **** { char *scratch = safe_strdup (s); @@ -1070,7 +1070,7 @@ mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1); s[n - 1] = 0; -*************** +*************** void menu_redraw_index (MUTTMENU *menu) *** 207,212 **** --- 208,214 ---- char buf[LONG_STRING]; @@ -1080,7 +1080,7 @@ for (i = menu->top; i < menu->top + menu->pagelen; i++) { if (i < menu->max) -*************** +*************** void menu_redraw_index (MUTTMENU *menu) *** 217,223 **** if (option (OPTARROWCURSOR)) { @@ -1097,7 +1097,7 @@ if (i == menu->current) { -*************** +*************** void menu_redraw_index (MUTTMENU *menu) *** 246,259 **** BKGDSET (MT_COLOR_INDICATOR); } @@ -1128,7 +1128,7 @@ } menu->redraw = 0; } -*************** +*************** void menu_redraw_motion (MUTTMENU *menu) *** 268,274 **** return; } @@ -1145,7 +1145,7 @@ SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -*************** +*************** void menu_redraw_motion (MUTTMENU *menu) *** 283,295 **** clrtoeol (); menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent); @@ -1174,7 +1174,7 @@ attrset (menu->color (menu->current)); ADDCOLOR (MT_COLOR_INDICATOR); addstr ("->"); -*************** +*************** void menu_redraw_motion (MUTTMENU *menu) *** 310,316 **** attrset (menu->color (menu->current)); ADDCOLOR (MT_COLOR_INDICATOR); @@ -1191,7 +1191,7 @@ print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0); SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); -*************** +*************** void menu_redraw_current (MUTTMENU *menu *** 322,328 **** { char buf[LONG_STRING]; @@ -1208,7 +1208,7 @@ menu_make_entry (buf, sizeof (buf), menu, menu->current); menu_pad_string (buf, sizeof (buf)); -*************** +*************** int mutt_menuLoop (MUTTMENU *menu) *** 875,881 **** @@ -1225,9 +1225,9 @@ else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else -*** mutt-1.5.21-orig/mh.c 2010-08-24 11:34:21.000000000 -0500 ---- mutt-1.5.21/mh.c 2012-08-29 12:07:18.000000000 -0500 -*************** +*** mutt-1.5.21/mh.c +--- mutt-1.5.21/mh.c Wed Aug 29 17:07:18 2012 +*************** int mh_buffy (const char *path) *** 235,247 **** if (mh_read_sequences (&mhs, path) < 0) @@ -1284,46 +1284,11 @@ static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt) { int fd; -*** mutt-1.5.21-orig/mutt_curses.h 2008-03-19 15:07:57.000000000 -0500 ---- mutt-1.5.21/mutt_curses.h 2012-08-29 11:25:04.000000000 -0500 -*************** -*** 64,69 **** ---- 64,70 ---- - #undef lines - #endif /* lines */ - -+ #define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol() - #define CLEARLINE(x) move(x,0), clrtoeol() - #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x) - #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0) -*************** -*** 126,131 **** ---- 127,134 ---- - MT_COLOR_BOLD, - MT_COLOR_UNDERLINE, - MT_COLOR_INDEX, -+ MT_COLOR_NEW, -+ MT_COLOR_FLAGGED, - MT_COLOR_MAX - }; - -*** mutt-1.5.21-orig/mutt_menu.h 2008-12-12 14:33:17.000000000 -0600 ---- mutt-1.5.21/mutt_menu.h 2012-08-29 12:08:10.000000000 -0500 -*************** -*** 34,39 **** ---- 34,40 ---- - #define REDRAW_FULL (1<<5) - #define REDRAW_BODY (1<<6) - #define REDRAW_SIGWINCH (1<<7) -+ #define REDRAW_SIDEBAR (1<<8) - - #define M_MODEFMT "-- Mutt: %s" - -*** mutt-1.5.21-orig/mutt.h 2012-12-18 16:48:18.248240958 +0100 ---- mutt-1.5.21-orig/mutt.h 2012-12-18 16:49:58.028242779 +0100 -*************** -*** 426,431 **** ---- 426,435 ---- +*** mutt-1.5.21/mutt.h +--- mutt-1.5.21/mutt.h Wed Aug 29 17:09:48 2012 +*************** enum +*** 425,430 **** +--- 425,434 ---- OPTSAVENAME, OPTSENDGROUPREPLYTO, OPTSCORE, @@ -1334,9 +1299,9 @@ OPTSIGDASHES, OPTSIGONTOP, OPTSORTRE, -*************** -*** 867,872 **** ---- 871,877 ---- +*************** typedef struct _context +*** 866,871 **** +--- 870,876 ---- { char *path; FILE *fp; @@ -1344,21 +1309,21 @@ time_t mtime; off_t size; off_t vsize; -*************** -*** 906,911 **** ---- 911,917 ---- +*************** typedef struct _context +*** 905,910 **** +--- 910,916 ---- unsigned int quiet : 1; /* inhibit status messages? */ unsigned int collapsed : 1; /* are all threads collapsed? */ unsigned int closing : 1; /* mailbox is being closed */ -+ unsigned int peekonly : 1; /* just taking a glance, revert atime */ ++ unsigned int peekonly : 1; /* just taking a glance, revert atime */ /* driver hooks */ void *data; /* driver specific data */ -*** mutt-1.5.21-orig/muttlib.c 2010-08-25 11:31:40.000000000 -0500 ---- mutt-1.5.21/muttlib.c 2012-08-29 11:25:04.000000000 -0500 -*************** -*** 1286,1291 **** ---- 1286,1293 ---- +*** mutt-1.5.21/muttlib.c +--- mutt-1.5.21/muttlib.c Wed Aug 29 16:25:04 2012 +*************** void mutt_FormatString (char *dest, /* +*** 1289,1294 **** +--- 1289,1296 ---- pl = pw = 1; /* see if there's room to add content, else ignore */ @@ -1367,9 +1332,9 @@ if ((col < COLS && wlen < destlen) || soft) { int pad; -*************** -*** 1329,1334 **** ---- 1331,1382 ---- +*************** void mutt_FormatString (char *dest, /* +*** 1332,1337 **** +--- 1334,1385 ---- col += wid; src += pl; } @@ -1422,11 +1387,46 @@ break; /* skip rest of input */ } else if (ch == '|') -*** mutt-1.5.21-orig/mx.c 2010-09-13 12:19:55.000000000 -0500 ---- mutt-1.5.21/mx.c 2012-08-29 12:12:49.000000000 -0500 +*** mutt-1.5.21/mutt_curses.h +--- mutt-1.5.21/mutt_curses.h Wed Aug 29 16:25:04 2012 *************** -*** 580,585 **** ---- 580,586 ---- +*** 64,69 **** +--- 64,70 ---- + #undef lines + #endif /* lines */ + ++ #define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol() + #define CLEARLINE(x) move(x,0), clrtoeol() + #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x) + #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0) +*************** enum +*** 126,131 **** +--- 127,134 ---- + MT_COLOR_BOLD, + MT_COLOR_UNDERLINE, + MT_COLOR_INDEX, ++ MT_COLOR_NEW, ++ MT_COLOR_FLAGGED, + MT_COLOR_MAX + }; + +*** mutt-1.5.21/mutt_menu.h +--- mutt-1.5.21/mutt_menu.h Wed Aug 29 17:08:10 2012 +*************** +*** 34,39 **** +--- 34,40 ---- + #define REDRAW_FULL (1<<5) + #define REDRAW_BODY (1<<6) + #define REDRAW_SIGWINCH (1<<7) ++ #define REDRAW_SIDEBAR (1<<8) + + #define M_MODEFMT "-- Mutt: %s" + +*** mutt-1.5.21/mx.c +--- mutt-1.5.21/mx.c Wed Aug 29 17:12:49 2012 +*************** static int mx_open_mailbox_append (CONTE +*** 595,600 **** +--- 595,601 ---- * M_APPEND open mailbox for appending * M_READONLY open mailbox in read-only mode * M_QUIET only print error messages @@ -1434,9 +1434,9 @@ * ctx if non-null, context struct to use */ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx) -*************** -*** 602,607 **** ---- 603,610 ---- +*************** CONTEXT *mx_open_mailbox (const char *pa +*** 617,622 **** +--- 618,625 ---- ctx->quiet = 1; if (flags & M_READONLY) ctx->readonly = 1; @@ -1445,8 +1445,8 @@ if (flags & (M_APPEND|M_NEWFOLDER)) { -*************** -*** 701,713 **** +*************** CONTEXT *mx_open_mailbox (const char *pa +*** 721,733 **** void mx_fastclose_mailbox (CONTEXT *ctx) { int i; @@ -1460,7 +1460,7 @@ if (ctx->mx_close) ctx->mx_close (ctx); ---- 704,729 ---- +--- 724,749 ---- void mx_fastclose_mailbox (CONTEXT *ctx) { int i; @@ -1487,18 +1487,20 @@ if (ctx->mx_close) ctx->mx_close (ctx); -@@ -755,6 +755,8 @@ - mutt_clear_threads (ctx); - for (i = 0; i < ctx->msgcount; i++) - mutt_free_header (&ctx->hdrs[i]); -+ ctx->msgcount -= ctx->deleted; -+ set_buffystats(ctx); - FREE (&ctx->hdrs); - FREE (&ctx->v2r); - #ifdef USE_COMPRESSED -*************** -*** 812,817 **** ---- 830,839 ---- +*************** void mx_fastclose_mailbox (CONTEXT *ctx) +*** 739,744 **** +--- 755,762 ---- + mutt_clear_threads (ctx); + for (i = 0; i < ctx->msgcount; i++) + mutt_free_header (&ctx->hdrs[i]); ++ ctx->msgcount -= ctx->deleted; ++ set_buffystats(ctx); + FREE (&ctx->hdrs); + FREE (&ctx->v2r); + #ifdef USE_COMPRESSED +*************** int mx_close_mailbox (CONTEXT *ctx, int +*** 842,847 **** +--- 860,869 ---- if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED))) read_msgs++; @@ -1509,11 +1511,11 @@ } if (read_msgs && quadoption (OPT_MOVE) != M_NO) -*** mutt-1.5.21-orig/mx.h 2009-08-25 14:08:52.000000000 -0500 ---- mutt-1.5.21/mx.h 2012-08-29 12:06:47.000000000 -0500 -*************** -*** 58,63 **** ---- 58,64 ---- +*** mutt-1.5.21/mx.h +--- mutt-1.5.21/mx.h Wed Aug 29 17:06:47 2012 +*************** int mh_read_dir (CONTEXT *, const char * +*** 61,66 **** +--- 61,67 ---- int mh_sync_mailbox (CONTEXT *, int *); int mh_check_mailbox (CONTEXT *, int *); int mh_buffy (const char *); @@ -1521,9 +1523,9 @@ int mh_check_empty (const char *); int maildir_read_dir (CONTEXT *); -*** mutt-1.5.21-orig/OPS 2010-03-01 11:56:19.000000000 -0600 ---- mutt-1.5.21/OPS 2012-08-29 11:25:04.000000000 -0500 -*************** +*** mutt-1.5.21/OPS +--- mutt-1.5.21/OPS Wed Aug 29 16:25:04 2012 +*************** OP_WHAT_KEY "display the keycode for a k *** 179,181 **** --- 179,186 ---- OP_MAIN_SHOW_LIMIT "show currently active limit pattern" @@ -1534,8 +1536,8 @@ + OP_SIDEBAR_NEXT "go down to next mailbox" + OP_SIDEBAR_PREV "go to previous mailbox" + OP_SIDEBAR_OPEN "open hilighted mailbox" -*** mutt-1.5.21-orig/pager.c 2010-08-25 11:31:40.000000000 -0500 ---- mutt-1.5.21/pager.c 2012-08-29 11:36:24.000000000 -0500 +*** mutt-1.5.21/pager.c +--- mutt-1.5.21/pager.c Wed Aug 29 16:36:24 2012 *************** *** 29,34 **** --- 29,35 ---- @@ -1546,7 +1548,7 @@ #include "mutt_crypt.h" -*************** +*************** static int format_line (struct line_t ** *** 1095,1100 **** --- 1096,1102 ---- wchar_t wc; @@ -1556,7 +1558,7 @@ if (check_attachment_marker ((char *)buf) == 0) wrap_cols = COLS; -*************** +*************** mutt_pager (const char *banner, const ch *** 1571,1576 **** --- 1573,1579 ---- @@ -1566,7 +1568,7 @@ int helpoffset = LINES - 2; /* offset for the help bar. */ int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */ -*************** +*************** mutt_pager (const char *banner, const ch *** 1745,1751 **** if ((redraw & REDRAW_BODY) || topline != oldtopline) { @@ -1583,7 +1585,7 @@ curline = oldtopline = topline; lines = 0; force_redraw = 0; -*************** +*************** mutt_pager (const char *banner, const ch *** 1758,1763 **** --- 1761,1767 ---- &QuoteList, &q_level, &force_redraw, &SearchRE) > 0) @@ -1593,7 +1595,7 @@ } last_offset = lineInfo[curline].offset; } while (force_redraw); -*************** +*************** mutt_pager (const char *banner, const ch *** 1771,1776 **** --- 1775,1781 ---- addch ('~'); @@ -1603,7 +1605,7 @@ } /* We are going to update the pager status bar, so it isn't * necessary to reset to normal color now. */ -*************** +*************** mutt_pager (const char *banner, const ch *** 1786,1791 **** --- 1791,1798 ---- hfi.ctx = Context; @@ -1614,8 +1616,8 @@ if (last_pos < sb.st_size - 1) snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size)); else -*************** -*** 1801,1822 **** +*************** mutt_pager (const char *banner, const ch +*** 1794,1815 **** /* print out the pager status bar */ SETCOLOR (MT_COLOR_STATUS); BKGDSET (MT_COLOR_STATUS); @@ -1664,12 +1666,12 @@ ! mutt_paddstr (statuswidth, bn); } + if(!option(OPTSTATUSONTOP) || PagerIndexLines == 0) -+ DrawFullLine = 0; /* reset */ ++ DrawFullLine = 0; /* reset */ BKGDSET (MT_COLOR_NORMAL); SETCOLOR (MT_COLOR_NORMAL); if (option(OPTXTERMSETTITLES)) -*************** -*** 1819,1836 **** +*************** mutt_pager (const char *banner, const ch +*** 1826,1843 **** /* redraw the pager_index indicator, because the * flags for this message might have changed. */ menu_redraw_current (index); @@ -1688,7 +1690,7 @@ redraw = 0; if (option(OPTBRAILLEFRIENDLY)) { ---- 1833,1856 ---- +--- 1840,1863 ---- /* redraw the pager_index indicator, because the * flags for this message might have changed. */ menu_redraw_current (index); @@ -1713,9 +1715,9 @@ redraw = 0; if (option(OPTBRAILLEFRIENDLY)) { -*************** -*** 2756,2761 **** ---- 2776,2788 ---- +*************** search_next: +*** 2763,2768 **** +--- 2783,2795 ---- mutt_what_key (); break; @@ -1729,9 +1731,17 @@ default: ch = -1; break; -*** mutt-1.5.21-orig/pattern.c 2010-08-24 11:34:21.000000000 -0500 ---- mutt-1.5.21/pattern.c 2012-08-29 12:10:31.000000000 -0500 +*** mutt-1.5.21/PATCHES +--- mutt-1.5.21/PATCHES Wed Aug 29 18:22:48 2012 *************** +*** 1,2 **** +--- 1,3 ---- ++ patch-1.5.21.sidebar.20120829.txt + patch-1.5.19.rr.compressed.1 + patch-1.5.5.1.nt.xtitles.3.ab.1 +*** mutt-1.5.21/pattern.c +--- mutt-1.5.21/pattern.c Wed Aug 29 17:10:31 2012 +*************** msg_search (CONTEXT *ctx, pattern_t* pat *** 154,159 **** --- 154,163 ---- HEADER *h = ctx->hdrs[msgno]; @@ -1744,7 +1754,7 @@ if ((msg = mx_open_message (ctx, msgno)) != NULL) { -*************** +*************** msg_search (CONTEXT *ctx, pattern_t* pat *** 163,174 **** --- 167,186 ---- memset (&s, 0, sizeof (s)); @@ -1767,7 +1777,7 @@ if (pat->op != M_BODY) mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL); -*************** +*************** msg_search (CONTEXT *ctx, pattern_t* pat *** 184,190 **** --- 196,206 ---- if (s.fpout) @@ -1781,7 +1791,7 @@ } return (0); } -*************** +*************** msg_search (CONTEXT *ctx, pattern_t* pat *** 193,203 **** --- 209,236 ---- mutt_body_handler (h->content, &s); @@ -1812,7 +1822,7 @@ } else { -*************** +*************** msg_search (CONTEXT *ctx, pattern_t* pat *** 244,250 **** --- 277,288 ---- if (option (OPTTHOROUGHSRC)) @@ -1827,15 +1837,9 @@ } } -*** mutt-1.5.21-orig/PATCHES 2008-03-19 15:07:06.000000000 -0500 ---- mutt-1.5.21/PATCHES 2012-08-29 13:22:48.000000000 -0500 -*************** -*** 0 **** ---- 1 ---- -+ patch-1.5.21.sidebar.20120829.txt -*** mutt-1.5.21-orig/protos.h 2010-08-24 11:34:21.000000000 -0500 ---- mutt-1.5.21/protos.h 2012-08-29 12:09:02.000000000 -0500 -*************** +*** mutt-1.5.21/protos.h +--- mutt-1.5.21/protos.h Wed Aug 29 17:09:02 2012 +*************** struct hdr_format_info *** 36,41 **** --- 36,48 ---- const char *pager_progress; @@ -1851,8 +1855,8 @@ void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag); int mutt_extract_token (BUFFER *, BUFFER *, int); -*** mutt-1.5.21-orig/sidebar.c 1969-12-31 18:00:00.000000000 -0600 ---- mutt-1.5.21/sidebar.c 2012-08-29 12:16:48.000000000 -0500 +*** mutt-1.5.21/sidebar.c +--- mutt-1.5.21/sidebar.c Wed Aug 29 17:16:48 2012 *************** *** 0 **** --- 1,405 ---- @@ -2261,8 +2265,8 @@ + draw_sidebar(menu); + } + -*** mutt-1.5.21-orig/sidebar.h 1969-12-31 18:00:00.000000000 -0600 ---- mutt-1.5.21/sidebar.h 2012-08-29 11:25:04.000000000 -0500 +*** mutt-1.5.21/sidebar.h +--- mutt-1.5.21/sidebar.h Wed Aug 29 16:25:04 2012 *************** *** 0 **** --- 1,36 ---- @@ -2302,11 +2306,11 @@ + void set_buffystats(CONTEXT*); + + #endif /* SIDEBAR_H */ -*** mutt-1.5.21-orig/doc/Muttrc 2010-09-15 12:07:19.000000000 -0500 ---- mutt-1.5.21/doc/Muttrc 2012-08-29 11:25:04.000000000 -0500 -*************** -*** 657,662 **** ---- 657,682 ---- +*** mutt-1.5.21/doc/Muttrc +--- mutt-1.5.21/doc/Muttrc Wed Aug 29 16:25:04 2012 +*************** set check_mbox_size=yes +*** 662,667 **** +--- 662,687 ---- # $crypt_autosign, $crypt_replysign and $smime_is_default. # # @@ -2333,9 +2337,9 @@ # set crypt_autosign=no # # Name: crypt_autosign -*** mutt-1.5.21-orig/imap/imap.c 2009-08-25 14:08:52.000000000 -0500 ---- mutt-1.5.21/imap/imap.c 2012-08-29 11:25:04.000000000 -0500 -*************** +*** mutt-1.5.21/imap/imap.c +--- mutt-1.5.21/imap/imap.c Wed Aug 29 16:25:04 2012 +*************** int imap_buffy_check (int force) *** 1521,1527 **** imap_munge_mbox_name (munged, sizeof (munged), name); @@ -2352,9 +2356,9 @@ if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0) { -*** mutt-1.5.21-orig/imap/command.c 2010-09-15 10:39:31.000000000 -0500 ---- mutt-1.5.21/imap/command.c 2012-08-29 11:25:04.000000000 -0500 -*************** +*** mutt-1.5.21/imap/command.c +--- mutt-1.5.21/imap/command.c Wed Aug 29 16:25:04 2012 +*************** static void cmd_parse_status (IMAP_DATA* *** 1011,1016 **** --- 1011,1023 ---- opened */ diff --git a/mutt.spec b/mutt.spec index 298fc12..c0d763f 100644 --- a/mutt.spec +++ b/mutt.spec @@ -82,7 +82,7 @@ Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 -# http://lunar-linux.org/index.php?page=mutt-sidebar +# http://lunar-linux.org/mutt-sidebar Patch6: mutt-1.5.21.sidebar.20120829.patch Patch7: mutt-1.5.21-opennfs.dif Patch8: mutt-1.5.20-gpgme_set_locale.patch From a00312e68319e174facb0b464efec2b0465b7b93 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Jan 2013 09:56:49 +0000 Subject: [PATCH 3/5] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=86 --- mutt.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mutt.spec b/mutt.spec index c0d763f..f6b9dc0 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,6 @@ Name: mutt #!BuildIgnore: sendmail BuildRequires: autoconf BuildRequires: automake -BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-gssapi BuildRequires: docbook-xsl-stylesheets @@ -128,7 +127,9 @@ cp doc/Muttrc Muttrc.SuSE cp %{S:2} . %build +%if 0%{?suse_version} > 1100 autoreconf -fi +%endif CC=gcc CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" CFLAGS="$CFLAGS -fstack-protector" From 7f34eca2349aed03992a2023d7e728c72dca4d01 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Jan 2013 10:52:03 +0000 Subject: [PATCH 4/5] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=87 --- mutt.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mutt.spec b/mutt.spec index f6b9dc0..e2f093c 100644 --- a/mutt.spec +++ b/mutt.spec @@ -146,7 +146,9 @@ chmod 755 $KRB5CFGPATH --enable-imap \ --enable-pop \ --enable-pgp \ +%if 0%{?suse_version} >= 1100 --enable-gpgme \ +%endif --enable-nfs-fix \ --enable-mailtool \ --enable-compressed \ From 1777255e1a71000a22daf673ab28eac3a199f0af Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Jan 2013 11:00:38 +0000 Subject: [PATCH 5/5] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=88 --- mutt.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/mutt.changes b/mutt.changes index 421a042..087a6f4 100644 --- a/mutt.changes +++ b/mutt.changes @@ -3,6 +3,7 @@ Mon Jan 14 09:11:05 UTC 2013 - werner@suse.de - Remove spurious blank line from new patch to make older patch(1) also work with this +- Make it build with older products ------------------------------------------------------------------- Tue Dec 18 16:26:45 UTC 2012 - aginies@suse.com