Rebase to upstream version 2.1.5

Resolves: rhbz#2032988 rhbz#1959896
This commit is contained in:
Matej Mužila 2022-01-11 13:41:16 +01:00
parent b0fb57c1d0
commit c811fea79c
4 changed files with 9 additions and 4 deletions

1
.gitignore vendored
View File

@ -41,3 +41,4 @@ mutt-1.5.23.tar.gz
/mutt-2.0.2.tar.gz
/mutt-2.0.5.tar.gz
/mutt-2.0.6.tar.gz
/mutt-2.1.5.tar.gz

View File

@ -5,7 +5,7 @@ diff -up mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes mutt-1.9.1/doc/Makefile.a
check:
manual.txt: manual.html
- -LC_ALL=C lynx -localhost -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
- -LC_ALL=C lynx -localhost -dump -nolist -nonumbers -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+ -LC_ALL=C lynx -localhost -dump -nolist -display_charset=us-ascii manual.html > $@ || \
LC_ALL=C w3m -T text/html -I utf-8 -O utf-8 -dump < manual.html > $@ || \
LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@

View File

@ -19,8 +19,8 @@
Summary: A text mode mail user agent
Name: mutt
Version: 2.0.6
Release: 3%{?dist}
Version: 2.1.5
Release: 1%{?dist}
Epoch: 5
# The entire source code is GPLv2+ except
# pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@ -212,6 +212,10 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
%changelog
* Tue Jan 11 2022 Matej Mužila <mmuzila@redhat.com> - 5:2.1.5-1
- Rebase to upstream version 2.1.5
Resolves: rhbz#2032988 rhbz#1959896
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5:2.0.6-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688

View File

@ -1 +1 @@
SHA512 (mutt-2.0.6.tar.gz) = dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6
SHA512 (mutt-2.1.5.tar.gz) = 8daf534ef6b8f97bdbbc1bccb64dad51de6fe0fbdb41d3d5cbe418fe234000dc09ea2b790d2529c205f16b89c6963b6de98eaa2fdc6e3f5b55a3cb5f7962e0d5