- vvv.nttp patch updated to 1.11.1

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index e1427624f234c2814307c1db2aec46ba47bfe066..69c59e360c1a18871536ce8083d60499da92a6f0 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -2,6 +2,8 @@
 # TODO:
 # - gss/heimdal
 # - finish -folder_columns.patch
+# - update/drop -home_etc.patch
+# - update/drop -imap_recent.patch
 #
 # Conditional build:
 %bcond_with    slang           # use slang library instead of ncurses
@@ -9,7 +11,7 @@
 %bcond_with    folder_column   # build with folder_column patch
 %bcond_with    imap_recent     # show IMAP RECENT messages as new (instead of UNSEEN)
 %bcond_without sasl            # don't use sasl
-%bcond_without home_etc        # don't use home_etc
+%bcond_with    home_etc        # use home_etc
 %bcond_with    gdbm            # use GDBM instead of BerkeleyDB
 %bcond_with    qdbm            # use QDBM instead of BerkeleyDB
 %bcond_with    tokyocabinet    # use TokyoCabinet instead of BerkeleyDB
@@ -28,49 +30,43 @@ Summary(ru.UTF-8):  Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):     Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt
-Version:       1.11.0
-Release:       0.0.1
+Version:       1.11.1
+Release:       1
 Epoch:         6
 License:       GPL v2+
 Group:         Applications/Mail
 # temporarily dead? (Jun 2014)
 Source0:       ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
-# Source0-md5: b58fdddf76a880c6314c9d4df2c32efb
+# Source0-md5: 92827071664e8c8bfadcc2a100e25715
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
 Patch0:                %{name}-pl.po-update.patch
+Patch1:                %{name}-bj.status-time.patch
 # http://mutt.org.ua/download/
-Patch2:                %{name}-rr.compressed.patch
-Patch3:                %{name}-bj.status-time.patch
-# http://mutt.org.ua/download/
-Patch4:                %{name}-vvv.quote.patch
-Patch5:                %{name}-null_name.patch
-Patch6:                %{name}-cd.trash_folder.patch
-Patch7:                %{name}-cd.purge_message.patch
-Patch8:                %{name}-cd.signatures_menu.patch
+Patch2:                %{name}-vvv.quote.patch
+Patch3:                %{name}-null_name.patch
+Patch4:                %{name}-cd.signatures_menu.patch
 # http://www.mutt.ca/patches/ (dw.crypt-autoselectkey)
-Patch9:                %{name}-crypt-autoselectkey.patch
-Patch10:       %{name}-manual.patch
-Patch11:       %{name}-xface.patch
-Patch12:       %{name}-Muttrc_mbox_path.patch
-Patch13:       %{name}-po.patch
-Patch14:       %{name}-home_etc.patch
-Patch15:       %{name}-Muttrc.patch
-Patch16:       %{name}-muttbug-tmp.patch
-Patch17:       %{name}-folder_columns.patch
-Patch18:       %{name}-imap_recent.patch
-Patch19:       %{name}-Muttrc.head.patch
-Patch20:       %{name}-smime.rc.patch
-Patch21:       %{name}-sidebar.patch
-Patch22:       %{name}-imap_fast_trash.patch
-Patch23:       %{name}-db.patch
+Patch5:                %{name}-crypt-autoselectkey.patch
+Patch6:                %{name}-manual.patch
+Patch7:                %{name}-xface.patch
+Patch8:                %{name}-Muttrc_mbox_path.patch
+Patch9:                %{name}-po.patch
+Patch10:       %{name}-Muttrc.head.patch
+Patch11:       %{name}-smime.rc.patch
+Patch12:       %{name}-db.patch
+Patch13:       format-security.patch
+Patch14:       %{name}-keep_to.patch
+Patch15:       %{name}-vvv.initials.patch
+# applied during %%install
+Patch50:       %{name}-Muttrc.patch
+# bcond-related patches
+Patch101:      %{name}-home_etc.patch
 # http://mutt.org.ua/download/
-Patch24:       %{name}-vvv.nntp.patch
-Patch25:       format-security.patch
-Patch26:       %{name}-keep_to.patch
-Patch27:       mutt-gpgme.patch
-Patch28:       openssl.patch
+Patch102:      %{name}-vvv.nntp.patch
+Patch103:      %{name}-folder_columns.patch
+Patch104:      %{name}-imap_recent.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1.6
@@ -156,35 +152,27 @@ Mutt - це невеликий, але потужний повноекранни
 %setup -q
 # pl.poupdate
 #%patch0 -p1
-# compressed patch applied upstream
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch8 -p1
-#%patch9 -p1
-#%patch10 -p1
-#%patch11 -p1
-#%patch12 -p1
-#%patch13 -p1
-#%{?with_home_etc:%patch14 -p1}
-#%patch15 -p1
-#%patch16 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+
+%{?with_home_etc:%patch101 -p1}
+%{?with_nntp:%patch102 -p1}
 # breaks display if arrow_cursor is set
-#%{?with_folder_column:%patch17 -p1}
-#%{?with_imap_recent:%patch18 -p1}
-#%patch19 -p1
-#%patch20 -p1
-#%patch21 -p1
-#%patch22 -p1
-#%patch23 -p1
-#%{?with_nntp:%patch24 -p1}
-#%patch25 -p1
-#%patch26 -p1
-#%patch27 -p1
-#%patch28 -p1
+%{?with_folder_column:%patch103 -p1}
+%{?with_imap_recent:%patch1043 -p1}
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
@@ -207,6 +195,7 @@ Mutt - це невеликий, але потужний повноекранни
        --enable-mailtool \
        %{?with_nntp:--enable-nntp} \
        --enable-pop \
+       --enable-sidebar \
        --enable-smtp \
        %{?with_bdb:--with-bdb=/usr} \
        %{!?with_slang:--with-curses} \
@@ -234,7 +223,7 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1} \
        DESTDIR=$RPM_BUILD_ROOT \
        DOTLOCK_GROUP=
 
-%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH15}
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH50}
 
 install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
 install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d