rpms/mutt/devel .cvsignore, 1.19, 1.20 mutt.spec, 1.63, 1.64 sources, 1.19, 1.20 mutt-1.5.19-db47.patch, 1.1, NONE mutt-1.5.19-gnutls.patch, 1.1, NONE mutt-1.5.19-inodesort.patch, 1.1, NONE mutt-1.5.19-realpath.patch, 1.1, NONE mutt-1.5.19-saslcb.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28791

Modified Files:
	.cvsignore mutt.spec sources 
Removed Files:
	mutt-1.5.19-db47.patch mutt-1.5.19-gnutls.patch 
	mutt-1.5.19-inodesort.patch mutt-1.5.19-realpath.patch 
	mutt-1.5.19-saslcb.patch 
Log Message:
- update to post 1.5.20 hg snapshot (#515148)
- use hunspell by default (#510358)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	7 Jan 2009 14:06:21 -0000	1.19
+++ .cvsignore	18 Sep 2009 12:30:22 -0000	1.20
@@ -1 +1 @@
-mutt-1.5.19.tar.gz
+mutt-1.5.20-20090827hg605559.tar.bz2


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- mutt.spec	25 Jul 2009 15:26:57 -0000	1.63
+++ mutt.spec	18 Sep 2009 12:30:23 -0000	1.64
@@ -15,29 +15,26 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.19
-Release: 6%{?dist}
+Version: 1.5.20
+Release: 1.20090827hg605559%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
 License: GPLv2+ and Public Domain
 Group: Applications/Internet
-Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
+# hg snapshot created from http://dev.mutt.org/hg/mutt
+Source: mutt-1.5.20-20090827hg605559.tar.bz2
+#Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch2: mutt-1.5.13-nodotlock.patch
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
-Patch7: mutt-1.5.19-db47.patch
-Patch8: mutt-1.5.19-realpath.patch
-Patch9: mutt-1.5.19-inodesort.patch
-Patch10: mutt-1.5.19-saslcb.patch
-Patch11: mutt-1.5.19-gnutls.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: aspell /usr/sbin/sendmail
 BuildRequires: ncurses-devel
 BuildRequires: gettext
+BuildRequires: automake
 # required to build documentation
 BuildRequires: docbook-style-xsl libxslt lynx
 
@@ -65,21 +62,19 @@ regular expression searches and a powerf
 for selecting groups of messages.
 
 %prep
-%setup -q
+%setup -q -n mutt
+./prepare -V
 # Thou shalt use fcntl, and only fcntl
 %patch2 -p1 -b .nodl
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch7 -p1 -b .db47
-%patch8 -p1 -b .realpath
-%patch9 -p1 -b .inodesort
-%patch10 -p1 -b .saslcb
-%patch11 -p1 -b .gnutls
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
 %build
 %configure \
+		SENDMAIL=%{_sbindir}/sendmail \
+		ISPELL=%{_bindir}/hunspell \
 %{?with_debug:	--enable-debug}\
 %{?with_pop:	--enable-pop}\
 %{?with_imap:	--enable-imap} \
@@ -114,11 +109,7 @@ cat contrib/gpg.rc >> \
 grep -5 "^color" contrib/sample.muttrc >> \
 	$RPM_BUILD_ROOT%{_sysconfdir}/Muttrc
 
-# and we use aspell
 cat >> $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc <<EOF
-# use aspell
-set ispell="%{_bindir}/aspell --mode=email check"
-
 source %{_sysconfdir}/Muttrc.local
 EOF
 
@@ -147,9 +138,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pgpewrap
 %{_bindir}/smime_keys
 %{_mandir}/man1/mutt.*
+%{_mandir}/man1/smime_keys.*
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Fri Sep 18 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.20-1.20090827hg605559
+- update to post 1.5.20 hg snapshot (#515148)
+- use hunspell by default (#510358)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:1.5.19-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	7 Jan 2009 14:06:21 -0000	1.19
+++ sources	18 Sep 2009 12:30:23 -0000	1.20
@@ -1 +1 @@
-73b3747bc7f7c805921e8d24ebac693f  mutt-1.5.19.tar.gz
+a459f1139a9fff840222268aa1bc17a0  mutt-1.5.20-20090827hg605559.tar.bz2


--- mutt-1.5.19-db47.patch DELETED ---


--- mutt-1.5.19-gnutls.patch DELETED ---


--- mutt-1.5.19-inodesort.patch DELETED ---


--- mutt-1.5.19-realpath.patch DELETED ---


--- mutt-1.5.19-saslcb.patch DELETED ---