Hello community,
here is the log from the commit of package mutt for openSUSE:Factory
checked in at Mon Jun 20 16:01:21 CEST 2011.
--------
--- mutt/mutt.changes 2011-04-15 14:17:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/mutt/mutt.changes 2011-06-20 15:25:41.000000000 +0200
@@ -1,0 +2,28 @@
+Mon Jun 20 15:11:39 CEST 2011 - werner@suse.de
+
+- Add patches for the following Mutt Tickets:
+ #1771: pipe-mime
+ #2179: score-match
+ #3240: imapuser
+ #3261: readonly-open
+ #3288: mx_update_context-segfault
+ #3293: dont-recode-saved-attachments
+ #3300: gpgme-1.2
+ #3324: smimekeys-tmpdir
+ #3326: emptycharset
+ #3335: thread-segfault
+ #3339: smime_keys-chaining
+ #3371: ansi-escape-segfault
+ #3378: references
+ #3457: pop3-segfault
+ #3459: split-fetches
+ #3483: header-strchr
+ #3496: no-implicit_autoview-for-text-html
+ #3506: gnutls-CN-validation
+ #3515: gnutls-deprecated-set-priority
+ #3516: gnutls-deprecated-verify-peers
+ with ticket #3506 bnc#700648 becomes fixed, with ticket #3496
+ the autoview regression for text/html should be fixed.
+- Add one line more for sidebar if displayed on top
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
mutt-1.5.21-patches.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.6tKz5Y/_old 2011-06-20 16:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.6tKz5Y/_new 2011-06-20 16:00:39.000000000 +0200
@@ -42,7 +42,7 @@
#Requires: desktop-data-SuSE
AutoReqProv: on
Version: 1.5.21
-Release: 16
+Release: 18
Summary: Mail Program
# ftp://ftp.mutt.org/mutt/devel/
Source0: %name-%version.tar.bz2
@@ -53,6 +53,7 @@
Source5: skel.muttrc
Source6: krb5-config
Source7: mutt-1.5.21.de.po
+Source8: %name-%version-patches.tar.bz2
Patch: %name-%version.dif
# http://www.spinnaker.de/mutt/compressed/
Patch1: patch-%version.rr.compressed.1.bz2
@@ -75,7 +76,12 @@
however.
%prep
-%setup -q -n mutt-%version
+%setup -q -n mutt-%version -b 8
+for p in ../%name-%version-patches/*; do
+ test -e $p || break
+ echo Patch $p
+ patch -s -p1 < $p
+done
%patch
%patch1 -p1
%patch2 -p0
@@ -83,7 +89,7 @@
%patch4 -p0
%patch5 -p1
%patch6 -p1
-%patch7 -p0
+%patch7 -p0 -b .sidebar
%patch8 -p0
%patch9 -p1
%patch10 -p1
++++++ mutt-1.5.21.sidebar-fix.dif ++++++
--- /var/tmp/diff_new_pack.6tKz5Y/_old 2011-06-20 16:00:39.000000000 +0200
+++ /var/tmp/diff_new_pack.6tKz5Y/_new 2011-06-20 16:00:39.000000000 +0200
@@ -64,7 +64,7 @@
BuffyCount++;
break;
--- sidebar.c
-+++ sidebar.c 2011-01-31 12:06:41.571925769 +0000
++++ sidebar.c 2011-06-20 12:30:59.803926815 +0000
@@ -28,6 +28,7 @@
#include "sidebar.h"
#include "buffy.h"
@@ -130,13 +130,15 @@
}
return entry;
}
-@@ -136,15 +146,17 @@ void set_curbuffy(char buf[LONG_STRING])
+@@ -136,6 +146,7 @@ void set_curbuffy(char buf[LONG_STRING])
int draw_sidebar(int menu) {
+ char folder_buffer[LINE_MAX];
int lines = option(OPTHELP) ? 1 : 0;
- BUFFY *tmp;
+ lines += option(OPTSTATUSONTOP) ? 1 : 0;
+
+@@ -143,10 +154,11 @@ int draw_sidebar(int menu) {
#ifndef USE_SLANG_CURSES
attr_t attrs;
#endif
@@ -150,7 +152,7 @@
static int prev_show_value;
static short saveSidebarWidth;
-@@ -168,7 +180,7 @@ int draw_sidebar(int menu) {
+@@ -170,7 +182,7 @@ int draw_sidebar(int menu) {
}
@@ -159,7 +161,7 @@
if (SidebarWidth > 0 && option (OPTSIDEBAR)
&& delim_len >= SidebarWidth) {
unset_option (OPTSIDEBAR);
-@@ -226,6 +238,32 @@ int draw_sidebar(int menu) {
+@@ -229,6 +241,32 @@ int draw_sidebar(int menu) {
SETCOLOR(MT_COLOR_NORMAL);
for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) {
@@ -192,7 +194,7 @@
if ( tmp == CurBuffy )
SETCOLOR(MT_COLOR_INDICATOR);
else if ( tmp->msg_unread > 0 )
-@@ -241,35 +279,36 @@ int draw_sidebar(int menu) {
+@@ -244,35 +282,36 @@ int draw_sidebar(int menu) {
tmp->msgcount = Context->msgcount;
tmp->msg_flagged = Context->flagged;
}
++++++ patch-1.5.21.sidebar-aa6aa.txt.bz2 ++++++
--- /var/tmp/diff_new_pack.6tKz5Y/_old 2011-06-20 16:00:40.000000000 +0200
+++ /var/tmp/diff_new_pack.6tKz5Y/_new 2011-06-20 16:00:40.000000000 +0200
@@ -959,7 +959,7 @@
break;
--- mutt-1.5.21/sidebar.c
+++ mutt-1.5.21/sidebar.c 2010-09-04 20:32:59.000000000 +0000
-@@ -0,0 +1,333 @@
+@@ -0,0 +1,336 @@
+/*
+ * Copyright (C) ????-2004 Justin Hibbits