Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-05-24 09:35:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutt" Changes: -------- --- /work/SRC/openSUSE:Factory/mutt/mutt.changes 2016-05-17 17:15:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-05-24 09:35:20.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 20 15:14:52 UTC 2016 - [email protected] + +- Enable some of the new patches like sidebar (boo#980830) +- Add patch COLS-workaround.dif which should become removed once + the sidebar patch does not modify COLS anymore + +------------------------------------------------------------------- New: ---- COLS-workaround.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.g6yL5g/_old 2016-05-24 09:35:21.000000000 +0200 +++ /var/tmp/diff_new_pack.g6yL5g/_new 2016-05-24 09:35:21.000000000 +0200 @@ -43,6 +43,9 @@ BuildRequires: libxslt BuildRequires: lynx BuildRequires: ncurses-devel +%if 0%{?is_opensuse} +BuildRequires: notmuch-devel +%endif BuildRequires: postfix BuildRequires: sgml-skel BuildRequires: update-desktop-files @@ -107,6 +110,8 @@ Patch18: mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19: bsc907453-CVE-2014-9116-jessie.patch +# PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream +Patch20: COLS-workaround.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -137,6 +142,7 @@ %patch16 -p0 -b .crlf %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 +%patch20 -p0 -b .cols rm -vf README*.orig rm -vf PATCHES*.orig @@ -200,6 +206,11 @@ --enable-nfs-fix \ --enable-mailtool \ --enable-compressed \ + --enable-sidebar \ +%if 0%{?is_opensuse} + --enable-notmuch \ +%endif + --enable-hcache \ --disable-external-dotlock \ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ ++++++ COLS-workaround.dif ++++++ Current neomutt sidebar patch does change COLS which does not work with threadsafe ncurses6 --- configure.ac | 8 ++++++++ 1 file changed, 8 insertions(+) --- configure.ac +++ configure.ac 2016-05-23 13:43:40.810914709 +0000 @@ -305,6 +305,14 @@ main () if test x$mutt_cv_curses != x/usr; then LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib" CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" + fi + if test -d /usr/include/ncurses5 ; then + if test -d /usr/lib64/ncurses5 ; then + LDFLAGS="$LDFLAGS -L/usr/lib64/ncurses5" + else + LDFLAGS="$LDFLAGS -L/usr/lib/ncurses5" + fi + CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses5" fi]) AC_CHECK_FUNC(initscr,,[
