- cleanup

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index aab4368ed120385f26fcd18bbeaf6fdee415d2cb..a07f05d293a41f233438fa7ca99ad99e97dcd1a6 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -3,9 +3,7 @@
 # - gss/heimdal
 # - finish -folder_columns.patch
 # - update/drop -home_etc.patch
-# - update/drop -nntp.patch
 # - update/drop -imap_recent.patch
-# - update -pl.po-update.patch
 #
 # Conditional build:
 %bcond_with    slang           # use slang library instead of ncurses
@@ -32,14 +30,13 @@ 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.12.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: f77586a895f12d19de9c5250a4dfd034
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
@@ -60,6 +57,7 @@ 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
@@ -77,8 +75,9 @@ BuildRequires:        docbook-dtd42-xml
 BuildRequires: docbook-style-xsl
 %{?with_gdbm:BuildRequires:    gdbm-devel}
 BuildRequires: gettext-tools
-BuildRequires: gpgme-devel >= 1:1.1.1
+BuildRequires: gpgme-devel >= 1:1.4.0
 %{?with_home_etc:BuildRequires:        home-etc-devel >= 1.0.8}
+BuildRequires: libgpg-error-devel >= 1.33
 BuildRequires: libidn-devel
 BuildRequires: libxslt-progs
 BuildRequires: lynx
@@ -87,8 +86,10 @@ BuildRequires:       openssl-devel >= 0.9.7d
 %{?with_qdbm:BuildRequires:    qdbm-devel}
 %{?with_slang:BuildRequires:   slang-devel}
 %{?with_tokyocabinet:BuildRequires:    tokyocabinet-devel}
+Requires:      gpgme >= 1:1.4.0
 %{?with_home_etc:Requires:     home-etc-lib >= 1.0.8}
 Requires:      iconv
+Requires:      libgpg-error >= 1.33
 Suggests:      mailcap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -167,12 +168,13 @@ Mutt - це невеликий, але потужний повноекранни
 %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:%patch103 -p1}
-%{?with_imap_recent:%patch1043 -p1}
+%{?with_imap_recent:%patch104 -p1}
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
@@ -195,6 +197,7 @@ Mutt - це невеликий, але потужний повноекранни
        --enable-mailtool \
        %{?with_nntp:--enable-nntp} \
        --enable-pop \
+       --enable-sidebar \
        --enable-smtp \
        %{?with_bdb:--with-bdb=/usr} \
        %{!?with_slang:--with-curses} \
@@ -269,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT
 %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*
+%attr(755,root,root) %{_bindir}/pgpewrap
 %attr(755,root,root) %{_bindir}/smime_keys
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
@@ -278,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/mutt.png
 #%{_mandir}/man1/flea.1*
 %{_mandir}/man1/mutt*.1*
-%{_mandir}/man1/pgp*.1*
+%{_mandir}/man1/pgpewrap.1*
 %{_mandir}/man1/smime_keys.1*
 %{_mandir}/man5/mmdf.5*
 %{_mandir}/man5/muttrc.5*