Added autoconf.patch, rel. 10

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index f71960ac9be279edcf70de00885f3523864d4b20..8307682a858ac4197713714714dff7f126861ede 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -29,7 +29,7 @@ Summary(tr.UTF-8):    Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt
 Version:       1.5.21
-Release:       9
+Release:       10
 Epoch:         6
 License:       GPL v2+
 Group:         Applications/Mail
@@ -55,18 +55,19 @@ 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
 # http://mutt.org.ua/download/
-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
-Patch22:       %{name}-sidebar.patch
-Patch23:       %{name}-imap_fast_trash.patch
-Patch24:       %{name}-db.patch
+Patch24:       %{name}-vvv.nntp.patch
+Patch25:       autoconf.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1.6
@@ -86,9 +87,9 @@ BuildRequires:        openssl-devel >= 0.9.7d
 %{?with_qdbm:BuildRequires:    qdbm-devel}
 %{?with_slang:BuildRequires:   slang-devel}
 %{?with_tokyocabinet:BuildRequires:    tokyocabinet-devel}
+%{?with_home_etc:Requires:     home-etc-lib >= 1.0.8}
 Requires:      iconv
 Suggests:      mailcap
-%{?with_home_etc:Conflicts:    home-etc < 1.0.8}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags_ia32  -fomit-frame-pointer
@@ -164,18 +165,19 @@ Mutt - це невеликий, але потужний повноекранни
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%{?with_nntp:%patch14 -p1}
-%{?with_home_etc:%patch15 -p1}
+%{?with_home_etc:%patch14 -p1}
+%patch15 -p1
 %patch16 -p1
-%patch17 -p1
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch18 -p1}
-%{?with_imap_recent:%patch19 -p1}
+%{?with_folder_column:%patch17 -p1}
+%{?with_imap_recent:%patch18 -p1}
+%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
+%{?with_nntp:%patch24 -p1}
+%patch25 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
@@ -225,7 +227,7 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1} \
        DESTDIR=$RPM_BUILD_ROOT \
        DOTLOCK_GROUP=
 
-%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16}
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH15}
 
 install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
 install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d