- 1.5.21

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index bbe024159ac52487a56089e1688e4a3de3ceac1e..fb614c22ade49bb47369c64f40fb902264feaa50 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,4 +1,7 @@
 #
+# TODO:
+# - finish -folder_columns.patch
+#
 # Conditional build:
 %bcond_with    slang           # use slang library instead of ncurses
 %bcond_with    nntp            # use VVV's NNTP patch
@@ -18,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.17
-Release:       2
+Version:       1.5.21
+Release:       1
 Epoch:         6
-License:       GPL
+License:       GPL v2+
 Group:         Applications/Mail
 Source0:       ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5: 49387458be0cb52b85ae0d73af699aae
+# Source0-md5: a29db8f1d51e2f10c070bf88e8a553fd
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
@@ -41,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}-send_charset.patch
-Patch13:       %{name}-xface.patch
-Patch14:       %{name}-Muttrc_mbox_path.patch
-Patch15:       %{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/
-Patch16:       %{name}-vvv.nntp.patch
-Patch17:       %{name}-home_etc.patch
-Patch18:       %{name}-Muttrc.patch
-Patch19:       %{name}-muttbug-tmp.patch
-Patch20:       %{name}-folder_columns.patch
-Patch21:       %{name}-nr.tag_prefix_cond.patch
-Patch22:       %{name}-imap_mxcmp.patch
-Patch23:       %{name}-imap_recent.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
@@ -78,7 +78,7 @@ Requires:     iconv
 Suggests:      mailcap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                specflags_ia32   -fomit-frame-pointer 
+%define                specflags_ia32  -fomit-frame-pointer
 
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
@@ -153,18 +153,15 @@ Mutt - це невеликий, але потужний повноекранни
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%{?with_nntp:%patch16 -p1}
-%{?with_home_etc:%patch17 -p1}
-%patch18 -p1
-%patch19 -p1
+%{?with_nntp:%patch14 -p1}
+%{?with_home_etc:%patch15 -p1}
+%patch16 -p1
+%patch17 -p1
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch20 -p1}
-# disabled - changes default behaviour
-#%patch21 -p0
-%patch22 -p1
-%{?with_imap_recent:%patch23 -p1}
+%{?with_folder_column:%patch18 -p1}
+%{?with_imap_recent:%patch19 -p1}
+%patch20 -p1
+%patch21 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -188,14 +185,15 @@ rm -f doc/{manual*.html,manual.txt}
        %{?with_nntp:--enable-nntp} \
        --enable-pop \
        --enable-smtp \
-       --with-bdb=/usr --without-gdbm \
+       --with-bdb=/usr \
+       --without-gdbm \
        %{!?with_slang:--with-curses} \
        --with-docdir=%{_docdir}/%{name} \
        %{?with_home_etc:--with-home-etc} \
        --with-mailpath=/var/mail \
        --with-mixmaster \
        --with-regex \
-       %{?with_sasl:--with-sasl2} \
+       %{?with_sasl:--with-sasl} \
        %{?with_slang:--with-slang} \
        --with-ssl
 
@@ -204,18 +202,30 @@ rm -f doc/{manual*.html,manual.txt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        DOTLOCK_GROUP=
 
-%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12}
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16}
+
+install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
+install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
+install contrib/colors.linux $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d/colors.rc
 
 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
+#!/bin/sh -e
+for rc in /etc/Muttrc.d/*.rc; do
+       [ ! -r "$rc" ] || echo "source \"$rc\""
+done
+EOF
+
 # keep manual.txt.gz, the rest is installed as %doc
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
 gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}/manual.txt
@@ -233,8 +243,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface
+%dir %{_sysconfdir}/Muttrc.d
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
+%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc.d/*.rc
 %attr(755,root,root) %{_bindir}/mutt
+%attr(755,root,root) %{_bindir}/mutt_source-muttrc.d
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
 %attr(755,root,root) %{_bindir}/pgp*