--- mutt-1.5.21-22.1.3.suse12.1.spec.orig	2011-10-30 09:01:01.000000000 +1300
+++ mutt-1.5.21-60.2.spec	2012-03-14 20:50:06.832432345 +1300
@@ -42,7 +42,7 @@
 #Requires:    desktop-data-SuSE
 AutoReqProv:    on
 Version:        1.5.21
-Release:        22.1.3
+Release:        60.2
 Summary:        Mail Program
 # ftp://ftp.mutt.org/mutt/devel/
 Source0:        %name-%version.tar.bz2
@@ -67,6 +67,7 @@
 Patch8:         mutt-1.5.21-opennfs.dif
 Patch9:         mutt-1.5.20-gpgme_set_locale.patch
 Patch10:        bug-676388-largefile.patch
+Patch101:	mutt-1.5.21-chmod+stamps.vk.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir %{_sysconfdir}
 
@@ -75,6 +76,12 @@
 highlighting, threading, and PGP. It takes some time to get used to,
 however.
 
+This package contains 2 changes from SuSE's package (Volker):
+1) The last-modified time stamp on mail files is updated when the file was
+   modified by mutt, e.g. when the new/unread/old status of messages changes.
+2) When a mail file is modified, chmod o-x is performed on the file, this works
+   in with using a umask of 076 with procmail.
+
 %prep
 %setup -q -n mutt-%version -b 8
 for p in ../%name-%version-patches/*; do
@@ -93,6 +100,7 @@
 %patch8 -p0 
 %patch9 -p1
 %patch10 -p1
+%patch101 -p1 -b .orig
 
 cp doc/Muttrc Muttrc.SuSE
 cp %{S:2} .
@@ -134,6 +142,8 @@
 make -C doc
 
 %install
+test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" \
+	&& rm -rf "$RPM_BUILD_ROOT"
 make install DESTDIR=$RPM_BUILD_ROOT
 mv Muttrc.SuSE $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc
 install -m 755 %{S:1} $RPM_BUILD_ROOT%{_bindir}
@@ -195,6 +205,8 @@
 %config(noreplace) %{_sysconfdir}/Muttrc
 
 %changelog
+* Wed Mar 14 2012 Volker Kuhlmann
+- With modify-stamps and chmod patch; for openSUSE 12.1.
 * Thu Jul  7 2011 werner@suse.de
 - Update patch for Mutt Ticket #3288 and check for empty headers
   in mx_update_context() (bnx#704359)
@@ -223,6 +235,8 @@
   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
+* Fri May 20 2011 Volker Kuhlmann
+- With modify-stamps and chmod patch; for openSUSE 11.4.
 * Fri Apr 15 2011 werner@suse.de
 - Support offsets in 2gig mbox files even on 32bit architectures (bnc#676388)
 * Thu Feb  3 2011 ro@suse.de
@@ -260,6 +274,8 @@
 - Update for bnc#537141: do not add certificates with wrong hosts
 * Tue Nov  3 2009 coolo@novell.com
 - updated patches to apply with fuzz=0
+* Thu Oct 29 2009 Volker Kuhlmann
+- With modify-stamps and chmod patch; for openSUSE 11.1.
 * Wed Sep  9 2009 werner@suse.de
 - Fix incorrectly handling of \0 character in SSL certificate (bnc#537141)
 * Wed Jul 15 2009 werner@suse.de
@@ -280,6 +296,8 @@
 - use regex(7) of glibc
 * Thu Apr 10 2008 werner@suse.de
 - Avoid trouble with krb5-config
+* Fri Feb 02 2008 Volker Kuhlmann
+- With modify-stamps and chmod patch; for openSUSE 10.3.
 * Thu Dec 20 2007 bwalle@suse.de
 - updated to mutt version 1.5.17 the bug fix release
 - updated sidebar patch to 1.5.17.sidebar.20071102
@@ -290,6 +308,8 @@
 - 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
+* Mon Aug 06 2007 Volker Kuhlmann
+- Updated because of vendor update.
 * Thu Jun 21 2007 werner@suse.de
 - Update to mutt version 1.5.16 the bug fix version
 * Fri Jun  1 2007 werner@suse.de
@@ -300,6 +320,9 @@
 - add gdbm-devel and ncurses-devel BuildRequires
 * Mon Feb 26 2007 stbinner@suse.de
 - fix build by including icon and .desktop into package
+* Mon Feb 12 2007 Volker Kuhlmann
+- With modify-stamps and chmod patch; for SUSE 10.2.
+- Package available from: http://volker.top.geek.nz/soft/
 * Thu Nov 16 2006 werner@suse.de
 - Make sidebar fix smarter by not breaking new status (bug #221599)
 * Thu Nov  9 2006 werner@suse.de
@@ -318,6 +341,9 @@
 * Thu Aug 17 2006 werner@suse.de
 - Update to mutt 1.5.13
   * Various fixes in imap handling
+* Wed Jul 26 2006 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- With modify-stamps and chmod patch; for SUSE 10.1.
+- Package available from: http://volker.dnsalias.net/soft/
 * Mon Jul 17 2006 werner@suse.de
 - Update to mutt 1.5.12
   * Include previous security fixes
@@ -328,10 +354,16 @@
 - Update to mutt 1.5.11
 * Wed Jun 28 2006 werner@suse.de
 - Fix mutt IMAP buffer overflow in namespace parsing (bug #188872)
+* Wed Jun 14 2006 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- With modify-stamps and chmod patch; for SUSE 10.1.
+- Package available from: http://volker.dnsalias.net/soft/
 * Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
 * Mon Jan 16 2006 mmj@suse.de
 - Compile with -fstack-protector
+* Tue Jan 03 2006 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- with modify-stamps and chmod patch; for SUSE 10.0
+- Package available from: http://volker.dnsalias.net/soft/
 * Tue Nov 29 2005 sbrabec@suse.cz
 - Don't package icon already present in desktop-data-SuSE.
   Cleans rpm -V output.
@@ -365,6 +397,8 @@
 - Rename mmdf.5 -> mmdf_mutt.5 to not conflict with tin
 * Tue Feb  1 2005 mmj@suse.de
 - Update to 1.5.7
+* Mon Jan 24 2005 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- update
 * Tue Jan 11 2005 mmj@suse.de
 - Fix plain auth for sasl with patch from HEAD [#49573]
 - Update header cache patch to latest
@@ -378,6 +412,8 @@
 * Wed Aug 18 2004 mmj@suse.de
 - Apply a new version of the header cache patch that also supports
   IMAP.
+* Thu Jul 22 2004 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- with modify-stamps and chmod patch; for SuSE 9.1
 * Fri Jul  2 2004 mmj@suse.de
 - Using upstream fix for problem with stat() on source files
   which could contain extra chars such as pipe [#42658]
@@ -457,8 +493,12 @@
 * Tue May 13 2003 mmj@suse.de
 - Use %%defattr
 - Package muttbug
+* Sat May 03 2003 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- with modify-stamps and chmod patch; for SuSE 8.2
 * Tue Apr 15 2003 ro@suse.de
 - fixed neededforbuild
+* Wed Mar 26 2003 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- with modify-stamps and chmod patch; for SuSE 8.1
 * Fri Mar 21 2003 mmj@suse.de
 - Update to 1.4.1 which primarily fixes the imap/utf7.c buffer-
   overflow.
@@ -470,6 +510,8 @@
 * Sun Jan  5 2003 mmj@suse.de
 - Below action was not A Good Thing[tm] for all, so made it a
   configure option again.
+* Sat Nov 16 2002 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- as from SuSE 8.1, but with modify-stamps and chmod patch; for SuSE 8.1
 * Fri Nov 15 2002 mmj@suse.de
 - Fold the group reply patch in to always be default behaviour
 * Fri Nov  8 2002 mmj@suse.de
@@ -480,6 +522,8 @@
 - Add patch from Michael Elkins to allow lines > 255 [#16030]
 - Make patches have a unique name
 - Trim the neededforbuild
+* Wed Jun 12 2002 Volker Kuhlmann <VolkerKuhlmann@gmx.de>
+- as from SuSE 8.0, but with modify-stamps patch; for SuSE 8.0
 * Fri May 31 2002 ro@suse.de
 - changed neededforbuild <slang> to <slang slang-devel>
 * Fri May 31 2002 mmj@suse.de
