- openssl 1.0.0 build fix

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 24d805da1cbdccfca91f0a85a83f36a18012f66c..8b690fa67e9c261efcea1bae588440fd1fd3d19c 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-# - rework -cd.signatures_menu.patch 
 # - finish -folder_columns.patch
 #
 # Conditional build:
@@ -22,13 +21,13 @@ Summary(ru.UTF-8):  Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):     Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt
-Version:       1.5.19
+Version:       1.5.20
 Release:       0.1
 Epoch:         6
 License:       GPL v2+
 Group:         Applications/Mail
 Source0:       ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5: 73b3747bc7f7c805921e8d24ebac693f
+# Source0-md5: 027cdd9959203de0c3c64149a7ee351c
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
@@ -45,22 +44,19 @@ Patch7:             %{name}-cd.purge_message.patch
 Patch8:                %{name}-cd.signatures_menu.patch
 # http://www.mutt.ca/patches/ (dw.crypt-autoselectkey)
 Patch9:                %{name}-crypt-autoselectkey.patch
-# http://www.mutt.ca/patches/ (dw.crypt-hook-both)
-Patch10:       %{name}-pgp_hook.patch
-Patch11:       %{name}-manual.patch
-Patch12:       %{name}-xface.patch
-Patch13:       %{name}-Muttrc_mbox_path.patch
-Patch14:       %{name}-po.patch
+Patch10:       %{name}-manual.patch
+Patch11:       %{name}-xface.patch
+Patch12:       %{name}-Muttrc_mbox_path.patch
+Patch13:       %{name}-po.patch
 # http://mutt.org.ua/download/
-Patch15:       %{name}-vvv.nntp.patch
-Patch16:       %{name}-home_etc.patch
-Patch17:       %{name}-Muttrc.patch
-Patch18:       %{name}-muttbug-tmp.patch
-Patch19:       %{name}-folder_columns.patch
-Patch20:       %{name}-imap_mxcmp.patch
-Patch21:       %{name}-imap_recent.patch
-Patch22:       %{name}-Muttrc.head.patch
-Patch23:       %{name}-smime.rc.patch
+Patch14:       %{name}-vvv.nntp.patch
+Patch15:       %{name}-home_etc.patch
+Patch16:       %{name}-Muttrc.patch
+Patch17:       %{name}-muttbug-tmp.patch
+Patch18:       %{name}-folder_columns.patch
+Patch19:       %{name}-imap_recent.patch
+Patch20:       %{name}-Muttrc.head.patch
+Patch21:       %{name}-smime.rc.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -151,24 +147,21 @@ Mutt - це невеликий, але потужний повноекранни
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-# XXX: needs update (searchBuf was removed from MUTTMENU struct in 1.5.19)
-#%%patch8 -p1
+%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%{?with_nntp:%patch15 -p1}
-%{?with_home_etc:%patch16 -p1}
+%{?with_nntp:%patch14 -p1}
+%{?with_home_etc:%patch15 -p1}
+%patch16 -p1
 %patch17 -p1
-%patch18 -p1
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch19 -p1}
+%{?with_folder_column:%patch18 -p1}
+%{?with_imap_recent:%patch19 -p1}
 %patch20 -p1
-%{?with_imap_recent:%patch21 -p1}
-%patch22 -p1
-%patch23 -p1
+%patch21 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -226,10 +219,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/mutt_source-muttrc.d
+cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/mutt_source-muttrc.d
 #!/bin/sh -e
 for rc in /etc/Muttrc.d/*.rc; do
-       test -r "$rc" && echo "source \"$rc\""
+       [ ! -r "$rc" ] || echo "source \"$rc\""
 done
 EOF