rpms/mutt/F-7 mutt-1.5.16-muttrc.patch, NONE, 1.1 mutt-1.5.17-manual.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 mutt.spec, 1.45, 1.46 sources, 1.14, 1.15 mutt-1.5.13-manual.patch, 1.1, NONE mutt-1.5.14-checkmboxsize.patch, 1.2, NONE mutt-1.5.14-muttrc.patch, 1.1, NONE mutt-apopmsgid.patch, 1.1, NONE mutt-gecos.patch, 1.1, NONE urlview-0.9-default.patch, 1.2, NONE urlview.diff, 1.1, NONE
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Thu Nov 8 14:59:16 UTC 2007
Author: mlichvar
Update of /cvs/pkgs/rpms/mutt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22193
Modified Files:
.cvsignore mutt.spec sources
Added Files:
mutt-1.5.16-muttrc.patch mutt-1.5.17-manual.patch
Removed Files:
mutt-1.5.13-manual.patch mutt-1.5.14-checkmboxsize.patch
mutt-1.5.14-muttrc.patch mutt-apopmsgid.patch mutt-gecos.patch
urlview-0.9-default.patch urlview.diff
Log Message:
- update to 1.5.17
- update license tag
- split urlview off, fix requires
mutt-1.5.16-muttrc.patch:
--- NEW FILE mutt-1.5.16-muttrc.patch ---
--- mutt-1.5.16/Muttrc.head.muttrc 2007-06-06 18:02:56.000000000 +0200
+++ mutt-1.5.16/Muttrc.head 2007-06-11 10:46:02.000000000 +0200
@@ -19,11 +19,15 @@
# Show documentation when pressing F1
macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+# and also F2, as some terminals use F1
+macro generic,pager <F2> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
bind browser y exit
+bind editor <delete> delete-char
+
# If Mutt is unable to determine your site's domain name correctly, you can
# set the default here.
#
mutt-1.5.17-manual.patch:
--- NEW FILE mutt-1.5.17-manual.patch ---
diff -up mutt-1.5.17/doc/Makefile.in.manual mutt-1.5.17/doc/Makefile.in
--- mutt-1.5.17/doc/Makefile.in.manual 2007-11-01 20:13:14.000000000 +0100
+++ mutt-1.5.17/doc/Makefile.in 2007-11-02 13:00:53.000000000 +0100
@@ -481,10 +481,9 @@ muttrc.man: ../makedoc$(EXEEXT) $(top_sr
mutt.1: $(srcdir)/mutt.man
$(EDIT) $(srcdir)/mutt.man > $@
-stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
+stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
$(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
- $(MAKE) ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \
diff -up mutt-1.5.17/init.h.manual mutt-1.5.17/init.h
--- mutt-1.5.17/init.h.manual 2007-10-31 18:48:52.000000000 +0100
+++ mutt-1.5.17/init.h 2007-11-02 13:00:53.000000000 +0100
@@ -19,7 +19,6 @@
#ifdef _MAKEDOC
# include "config.h"
-# include "makedoc-defs.h"
#else
# include "sort.h"
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-7/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 23 Feb 2007 18:38:07 -0000 1.14
+++ .cvsignore 8 Nov 2007 14:58:42 -0000 1.15
@@ -1,2 +1 @@
-urlview-0.9.tar.gz
-mutt-1.5.14.tar.gz
+mutt-1.5.17.tar.gz
Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-7/mutt.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mutt.spec 31 May 2007 07:53:47 -0000 1.45
+++ mutt.spec 8 Nov 2007 14:58:42 -0000 1.46
@@ -1,28 +1,25 @@
Summary: A text mode mail user agent
Name: mutt
-Version: 1.5.14
-Release: 4%{?dist}
+Version: 1.5.17
+Release: 1%{?dist}
Epoch: 5
-License: GPL
+# 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
-%define uversion 0.9
-Source2: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{uversion}.tar.gz
Source1: mutt_ldap_query
Patch2: mutt-1.5.13-nodotlock.patch
-Patch3: mutt-1.5.14-muttrc.patch
-Patch4: mutt-1.5.13-manual.patch
-Patch5: urlview-0.9-default.patch
-Patch6: urlview.diff
-Patch7: mutt-1.5.14-checkmboxsize.patch
-Patch8: mutt-apopmsgid.patch
-Patch9: mutt-gecos.patch
+Patch3: mutt-1.5.16-muttrc.patch
+Patch4: mutt-1.5.17-manual.patch
Url: http://www.mutt.org/
-Requires: /usr/sbin/sendmail webclient mailcap
+Requires: mailcap urlview
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: /usr/sbin/sendmail
BuildRequires: cyrus-sasl-devel db4-devel gnutls-devel krb5-devel ncurses-devel
-BuildRequires: libidn-devel gettext docbook-style-xsl libxslt lynx
+BuildRequires: libidn-devel gettext
+# required to build documentation
+BuildRequires: docbook-style-xsl libxslt lynx
%description
Mutt is a text-mode mail user agent. Mutt supports color, threading,
@@ -33,22 +30,18 @@
you are going to use.
%prep
-%setup -q -a 2
+%setup -q
# Thou shalt use fcntl, and only fcntl
%patch2 -p1 -b .nodl
%patch3 -p1 -b .muttrc
%patch4 -p1 -b .manual
-%patch5 -p0 -b .default
-%patch6 -p0 -b .build
-%patch7 -p1 -b .checkmboxsize
-%patch8 -p1 -b .apopmsgid
-%patch9 -p1 -b .gecos
install -p -m644 %{SOURCE1} mutt_ldap_query
%build
%configure \
--enable-pop --enable-imap \
+ --enable-smtp \
--with-gnutls \
--with-gss \
--with-sasl \
@@ -58,10 +51,6 @@
--with-docdir=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
-cd urlview-%{uversion}
-%configure
-make %{?_smp_mflags}
-
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
@@ -83,14 +72,6 @@
echo "# Local configuration for Mutt." > $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.local
-cd urlview-%{uversion}
-install urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir}
-install -m 644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
-mkdir -p doc/urlview
-cp -p AUTHORS ChangeLog COPYING README sample.urlview \
- doc/urlview
-cd ..
-
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/{*.dist,mime.types}
rm -f $RPM_BUILD_ROOT%{_bindir}/{flea,muttbug}
@@ -109,18 +90,19 @@
%doc COPYRIGHT ChangeLog GPL NEWS README* UPDATING mutt_ldap_query
%doc contrib/*.rc contrib/sample.* contrib/ca-bundle.crt contrib/colors.*
%doc doc/manual.txt doc/smime-notes.txt
-%doc urlview-%{uversion}/doc/urlview
%{_bindir}/mutt
%{_bindir}/pgpring
%{_bindir}/pgpewrap
%{_bindir}/smime_keys
-%{_bindir}/urlview
-%{_bindir}/url_handler.sh
-%{_mandir}/man1/urlview.*
%{_mandir}/man1/mutt.*
%{_mandir}/man5/muttrc.*
%changelog
+* Thu Nov 08 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.17-1.fc7
+- update to 1.5.17
+- update license tag
+- split urlview off, fix requires
+
* Thu May 31 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.14-4
- validate msgid in APOP authentication (CVE-2007-1558)
- fix overflow in gecos field handling (CVE-2007-2683)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-7/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 23 Feb 2007 18:38:07 -0000 1.14
+++ sources 8 Nov 2007 14:58:42 -0000 1.15
@@ -1,2 +1 @@
-67731f73e69297ffd106b65c8aebb2ab urlview-0.9.tar.gz
-6d33b4f0074e39772021d947c49b30c6 mutt-1.5.14.tar.gz
+49387458be0cb52b85ae0d73af699aae mutt-1.5.17.tar.gz
--- mutt-1.5.13-manual.patch DELETED ---
--- mutt-1.5.14-checkmboxsize.patch DELETED ---
--- mutt-1.5.14-muttrc.patch DELETED ---
--- mutt-apopmsgid.patch DELETED ---
--- mutt-gecos.patch DELETED ---
--- urlview-0.9-default.patch DELETED ---
--- urlview.diff DELETED ---
More information about the fedora-extras-commits
mailing list