From fff701810a00623c531fbc8489b333bdaa20c8a1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 20 Sep 2007 12:19:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=7 --- mutt-1.5.16.dif | 17 +++++++++++++++-- mutt.changes | 7 +++++++ mutt.spec | 17 ++++++++++------- patch-1.5.16.sidebar.20070408.txt.bz2 | 3 --- patch-1.5.16.sidebar.20070704.txt.bz2 | 3 +++ 5 files changed, 35 insertions(+), 12 deletions(-) delete mode 100644 patch-1.5.16.sidebar.20070408.txt.bz2 create mode 100644 patch-1.5.16.sidebar.20070704.txt.bz2 diff --git a/mutt-1.5.16.dif b/mutt-1.5.16.dif index da1194f..b51d48b 100644 --- a/mutt-1.5.16.dif +++ b/mutt-1.5.16.dif @@ -1,5 +1,5 @@ --- Muttrc -+++ Muttrc 2007-06-01 12:55:02.004189000 +0200 ++++ Muttrc 2007-09-20 13:02:08.475410283 +0200 @@ -18,7 +18,7 @@ macro index,pager,attach,compose \cb "\ "call urlview to extract URLs out of a message" @@ -22,6 +22,19 @@ # Name: autoedit # Type: boolean # Default: no +@@ -421,9 +421,9 @@ attachments -I message/external-body + # follow these menus. The option is disabled by default because many + # visual terminals don't permit making the cursor invisible. + # +-# +-# set check_mbox_size=no +-# ++ ++set check_mbox_size=yes ++ + # Name: check_mbox_size + # Type: boolean + # Default: no @@ -709,11 +709,11 @@ attachments -I message/external-body # filtered message is read from the standard output. # @@ -234,7 +247,7 @@ /* ** .pp --- doc/Makefile.in -+++ doc/Makefile.in 2007-06-12 12:04:49.827249163 +0200 ++++ doc/Makefile.in 2007-06-12 12:04:49.827249000 +0200 @@ -436,7 +436,7 @@ uninstall-local: check: diff --git a/mutt.changes b/mutt.changes index 77e3d78..ae6a305 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 20 13:05:05 CEST 2007 - werner@suse.de + +- Replace handmade sidebar patch with oringnal one +- Set check_mbox_sizes to make mutt backward compatible (#326697) +- Use imap_force_ssl alias for ssl_force_tls even in 10.3 + ------------------------------------------------------------------- Thu Jun 21 14:05:33 CEST 2007 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index 530f80d..729c355 100644 --- a/mutt.spec +++ b/mutt.spec @@ -13,18 +13,18 @@ Name: mutt #!BuildIgnore: sendmail BuildRequires: cyrus-sasl-devel cyrus-sasl-gssapi docbook-xsl-stylesheets docbook_4 gdbm-devel glibc-i18ndata gpgme-devel ispell krb5-devel libcom_err libgcrypt libgpg-error-devel libidn-devel libxml2 libxslt lynx ncurses-devel openssl-devel postfix sgml-skel update-desktop-files xli -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Networking/Email/Clients -URL: http://www.mutt.org +Url: http://www.mutt.org Provides: muttssl Obsoletes: muttssl Requires: smtp_daemon # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -Autoreqprov: on +AutoReqProv: on Version: 1.5.16 -Release: 1 +Release: 32 Summary: Mail Program BuildRoot: %{_tmppath}/%{name}-%{version}-build # ftp://ftp.mutt.org/mutt/devel/ @@ -41,7 +41,7 @@ Patch3: %name-1.5.9i-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 -Patch6: patch-%version.sidebar.20070408.txt.bz2 +Patch6: patch-%version.sidebar.20070704.txt.bz2 Patch7: mutt-1.5.15.sidebar-fix.dif Patch8: mutt-1.5.15-opennfs.dif @@ -78,7 +78,7 @@ CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" %if %suse_version > 1000 CFLAGS="$CFLAGS -fstack-protector" %endif -%if %suse_version < 1020 +%if %suse_version < 1030 CFLAGS="$CFLAGS -DSUSE_IMAP_FORCE_SSL" %endif KRB5CFGPATH=/usr/lib/mit/bin/krb5-config @@ -156,8 +156,11 @@ rm -rf $RPM_BUILD_ROOT %_mandir/man5/mbox_mutt.5.gz /usr/share/mutt %config(noreplace) /etc/Muttrc - %changelog +* Thu Sep 20 2007 - werner@suse.de +- Replace handmade sidebar patch with oringnal one +- Set check_mbox_sizes to make mutt backward compatible (#326697) +- Use imap_force_ssl alias for ssl_force_tls even in 10.3 * Thu Jun 21 2007 - werner@suse.de - Update to mutt version 1.5.16 the bug fix version * Fri Jun 01 2007 - werner@suse.de diff --git a/patch-1.5.16.sidebar.20070408.txt.bz2 b/patch-1.5.16.sidebar.20070408.txt.bz2 deleted file mode 100644 index 24a290f..0000000 --- a/patch-1.5.16.sidebar.20070408.txt.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:337240a739165138cea44a52969baca548cd9e24b0e3df4548abc684d935fc8f -size 10871 diff --git a/patch-1.5.16.sidebar.20070704.txt.bz2 b/patch-1.5.16.sidebar.20070704.txt.bz2 new file mode 100644 index 0000000..362c775 --- /dev/null +++ b/patch-1.5.16.sidebar.20070704.txt.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0965271eccd7533390403a3420837ead4935b733af54a301b2a9fb83aad0dd9c +size 11442