- rebuild with libidn 1.35

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index ed1a0e1ddbdeb9cfa34f91eac3f26e83ca57f1d8..c97964be1da81895c5c28732afa3652b8c87a1e9 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,18 +28,18 @@ Summary(ru.UTF-8):  Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):     Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt
-Version:       1.5.21
-Release:       9
+Version:       1.6.2
+Release:       4
 Epoch:         6
 License:       GPL v2+
 Group:         Applications/Mail
-Source0:       ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5: a29db8f1d51e2f10c070bf88e8a553fd
+# temporarily dead? (Jun 2014)
+Source0:       ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+# Source0-md5: 9f0f9cc35878987d7cdc7df6a1967376
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
 Patch0:                %{name}-pl.po-update.patch
-Patch1:                %{name}-forcedotlock.patch
 # http://mutt.org.ua/download/
 Patch2:                %{name}-rr.compressed.patch
 Patch3:                %{name}-bj.status-time.patch
@@ -67,6 +67,10 @@ Patch22:     %{name}-imap_fast_trash.patch
 Patch23:       %{name}-db.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
 URL:           http://www.mutt.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1.6
@@ -75,7 +79,7 @@ BuildRequires:        automake >= 1.6
 BuildRequires: docbook-dtd42-xml
 BuildRequires: docbook-style-xsl
 %{?with_gdbm:BuildRequires:    gdbm-devel}
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: gpgme-devel >= 1:1.1.1
 %{?with_home_etc:BuildRequires:        home-etc-devel >= 1.0.8}
 BuildRequires: libidn-devel
@@ -86,9 +90,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
@@ -151,7 +155,6 @@ Mutt - це невеликий, але потужний повноекранни
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -176,6 +179,10 @@ Mutt - це невеликий, але потужний повноекранни
 %patch22 -p1
 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
@@ -274,6 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man1/flea.1*
 %{_mandir}/man1/mutt*.1*
+%{_mandir}/man1/pgp*.1*
 %{_mandir}/man1/smime_keys.1*
 %{_mandir}/man5/mmdf.5*
 %{_mandir}/man5/muttrc.5*