- update to 1.5.17
This commit is contained in:
Miroslav Lichvar
parent
66105fd342
commit
cf430032a5
@ -1 +1 @@
|
||||
mutt-1.5.16.tar.gz
|
||||
mutt-1.5.17.tar.gz
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
--- mutt-1.5.16/doc/Makefile.in.manual 2007-06-10 04:43:25.000000000 +0200
|
||||
+++ mutt-1.5.16/doc/Makefile.in 2007-06-11 13:08:17.000000000 +0200
|
||||
@@ -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 && \
|
||||
--- mutt-1.5.16/doc/manual.xml.head.manual 2007-04-04 07:37:13.000000000 +0200
|
||||
+++ mutt-1.5.16/doc/manual.xml.head 2007-06-11 13:05:41.000000000 +0200
|
||||
@@ -5045,7 +5045,7 @@ changed with the <literal>edit-descripti
|
||||
<para>
|
||||
When you add an attachment to your mail message, Mutt searches your
|
||||
personal mime.types file at <literal>${HOME}/.mime.types</literal>, and then
|
||||
-the system mime.types file at <literal>/usr/local/share/mutt/mime.types</literal> or
|
||||
+the system mime.types file at <literal>/usr/share/mutt/mime.types</literal> or
|
||||
<literal>/etc/mime.types</literal>
|
||||
</para>
|
||||
|
||||
@@ -5102,7 +5102,7 @@ find an external handler. The default s
|
||||
is a colon delimited list set to
|
||||
|
||||
<screen>
|
||||
-${HOME}/.mailcap:/usr/local/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
|
||||
+${HOME}/.mailcap:/usr/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
|
||||
</screen>
|
||||
|
||||
where <literal>$HOME</literal> is your home directory.
|
||||
--- mutt-1.5.16/init.h.manual 2007-06-10 04:29:21.000000000 +0200
|
||||
+++ mutt-1.5.16/init.h 2007-06-11 13:05:41.000000000 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
#ifdef _MAKEDOC
|
||||
# include "config.h"
|
||||
-# include "makedoc-defs.h"
|
||||
#else
|
||||
# include "sort.h"
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
26
mutt-1.5.17-manual.patch
Normal file
26
mutt-1.5.17-manual.patch
Normal file
@ -0,0 +1,26 @@
|
||||
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
|
||||
13
mutt.spec
13
mutt.spec
@ -1,7 +1,7 @@
|
||||
Summary: A text mode mail user agent
|
||||
Name: mutt
|
||||
Version: 1.5.16
|
||||
Release: 4%{?dist}
|
||||
Version: 1.5.17
|
||||
Release: 1%{?dist}
|
||||
Epoch: 5
|
||||
# The entire source code is GPLv2+ except
|
||||
# pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
|
||||
@ -9,10 +9,9 @@ License: GPLv2+ and Public Domain
|
||||
Group: Applications/Internet
|
||||
Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
|
||||
Source1: mutt_ldap_query
|
||||
Patch1: mutt-1.5.16-md5.patch
|
||||
Patch2: mutt-1.5.13-nodotlock.patch
|
||||
Patch3: mutt-1.5.16-muttrc.patch
|
||||
Patch4: mutt-1.5.16-manual.patch
|
||||
Patch4: mutt-1.5.17-manual.patch
|
||||
Url: http://www.mutt.org/
|
||||
Requires: mailcap urlview
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -21,7 +20,6 @@ BuildRequires: cyrus-sasl-devel db4-devel gnutls-devel krb5-devel ncurses-devel
|
||||
BuildRequires: libidn-devel gettext
|
||||
# required to build documentation
|
||||
BuildRequires: docbook-style-xsl libxslt lynx
|
||||
BuildRequires: automake autoconf
|
||||
|
||||
%description
|
||||
Mutt is a small but very powerful text-based MIME mail client. Mutt
|
||||
@ -32,8 +30,6 @@ for selecting groups of messages.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .md5
|
||||
./prepare -V
|
||||
# Thou shalt use fcntl, and only fcntl
|
||||
%patch2 -p1 -b .nodl
|
||||
%patch3 -p1 -b .muttrc
|
||||
@ -101,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man5/muttrc.*
|
||||
|
||||
%changelog
|
||||
* Fri Nov 02 2007 Miroslav Lichvar <mlichvar@redhat.com> 5:1.5.17-1
|
||||
- update to 1.5.17
|
||||
|
||||
* Mon Sep 17 2007 Miroslav Lichvar <mlichvar@redhat.com> 5:1.5.16-4
|
||||
- fix md5 on big-endian systems
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user