- updated to 1.5.18

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index abc259b09bf1ae14ee7a85c759d37051a8bad191..2015ef94c4ab78d426573a0a02a2f06170a6223a 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,133 +1,145 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_with slang              # use slang library instead of ncurses
-%bcond_with nntp               # use VVV's NNTP patch
-%bcond_with esmtp              # use esmtp patch
-%bcond_without sasl            # don't use sasl
-%bcond_without home_etc                # don't use home_etc
+%bcond_with    slang           # use slang library instead of ncurses
+%bcond_with    nntp            # use VVV's NNTP patch
+%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

 #
 Summary:       The Mutt Mail User Agent
 #
 Summary:       The Mutt Mail User Agent

-Summary(de):   Der Mutt Mail-User-Agent
-Summary(es):   Mutt, cliente de correo electrónico
-Summary(fr):   Agent courrier Mutt
-Summary(ko):   ÅؽºÆ® ±â¹ÝÀÇ MUA
-Summary(pl):   Program pocztowy Mutt
-Summary(pt_BR):        Mutt, cliente de correio eletrônico
-Summary(ru):   ðÏÞÔÏ×ÁÑ ËÌÉÅÎÔÓËÁÑ ÐÒÏÇÒÁÍÍÁ Mutt
-Summary(tr):   Mutt elektronik posta programý
-Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
+Summary(de.UTF-8):     Der Mutt Mail-User-Agent
+Summary(es.UTF-8):     Mutt, cliente de correo electrónico
+Summary(fr.UTF-8):     Agent courrier Mutt
+Summary(ko.UTF-8):     텍스트 기반의 MUA
+Summary(pl.UTF-8):     Program pocztowy Mutt
+Summary(pt_BR.UTF-8):  Mutt, cliente de correio eletrônico
+Summary(ru.UTF-8):     Почтовая клиентская программа Mutt
+Summary(tr.UTF-8):     Mutt elektronik posta programı
+Summary(uk.UTF-8):     Поштова клієнтська програма Mutt

 Name:          mutt
 Name:          mutt

-Version:       1.4.1
-Release:       7
-Epoch:         5
+Version:       1.5.18
+Release:       1
+Epoch:         6

 License:       GPL
 Group:         Applications/Mail
 License:       GPL
 Group:         Applications/Mail

-Source0:       ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
-# Source0-md5: fb5418135c5be2638964eef2f654f847
+Source0:       ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
+# Source0-md5: 27c30037120189b9f9c0d3e76361b8f8

 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl

+Patch0:                %{name}-pl.po-update.patch

 Patch1:                %{name}-forcedotlock.patch
 Patch1:                %{name}-forcedotlock.patch

-Patch2:                %{name}-muttbug-tmp.patch
-Patch3:                %{name}-rr.compressed.patch
-Patch4:                %{name}-cd.edit_threads.patch
-Patch5:                %{name}-bj.status-time.patch
-Patch6:                %{name}-devl.narrow_tree.patch
-Patch7:                %{name}-vvv.quote.gz
-Patch8:                %{name}-null_name.patch
-Patch9:                %{name}-cd.trash_folder.patch
-Patch10:       %{name}-cd.purge_message.patch
-Patch11:       %{name}-cd.signatures_menu.patch
-Patch12:       %{name}-folder_columns.patch
-Patch13:       %{name}-nr.tag_prefix_cond.patch
-Patch14:       %{name}-LIBOBJ.patch
-Patch15:       %{name}-pgp_hook.patch
-Patch16:       %{name}-manual.patch
-Patch17:       %{name}-send_charset.patch
-Patch18:       %{name}-xface.patch
-Patch19:       %{name}-sasl2.patch
-Patch20:       %{name}-nntp.patch
-Patch21:       %{name}-esmtp.patch
-Patch22:       %{name}-home_etc.patch
-Patch23:       %{name}-kill_warnings.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
+# 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
+# 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

 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}

+BuildRequires: db-devel >= 4.0
+BuildRequires: docbook-dtd42-xml
+BuildRequires: docbook-style-xsl

 %{?with_home_etc:BuildRequires:        home-etc-devel >= 1.0.8}
 BuildRequires: gettext-devel
 %{?with_home_etc:BuildRequires:        home-etc-devel >= 1.0.8}
 BuildRequires: gettext-devel

+BuildRequires: gpgme-devel >= 1:1.1.0
+BuildRequires: libidn-devel
+BuildRequires: lynx

 %{!?with_slang:BuildRequires:  ncurses-devel >= 5.0}
 %{!?with_slang:BuildRequires:  ncurses-devel >= 5.0}

-BuildRequires: openssl-devel >= 0.9.7c
-BuildRequires: sgml-tools
-BuildRequires: sgml-tools-dtd
+BuildRequires: openssl-devel >= 0.9.7d

 %{?with_slang:BuildRequires:   slang-devel}
 %{?with_slang:BuildRequires:   slang-devel}

-%{?with_esmtp:BuildRequires:   libesmtp-devel}
+BuildRequires: libxslt-progs

 Requires:      iconv
 Requires:      iconv

-Requires:      mailcap

 %{?with_home_etc:Requires:     home-etc >= 1.0.8}
 %{?with_home_etc:Requires:     home-etc >= 1.0.8}

+Suggests:      mailcap

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 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.
 Features include MIME support, color, POP3 support, message threading,
 bindable keys, and threaded sorting mode.
 
 
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
 Features include MIME support, color, POP3 support, message threading,
 bindable keys, and threaded sorting mode.
 

-%description -l de
-Mutt ist ein kleiner aber leistungsfähiger Vollbild-Mail-Client für
-Unix mit MIME-Unterstützung, Farbe, POP3-Unterstützung,
+%description -l de.UTF-8
+Mutt ist ein kleiner aber leistungsfähiger Vollbild-Mail-Client für
+Unix mit MIME-Unterstützung, Farbe, POP3-Unterstützung,

 Nachrichten-Threading, zuweisbaren Tasten und Sortieren nach Threads.
 
 Nachrichten-Threading, zuweisbaren Tasten und Sortieren nach Threads.
 

-%description -l es
-Mutt es un pequeño, pero muy potente cliente de correo en pantalla
+%description -l es.UTF-8
+Mutt es un pequeño, pero muy potente cliente de correo en pantalla

 llena. Incluye soporte a tipos MINE, color, POP3; encadenamiento de
 mensajes, teclas configurables y clasificaciones por encadenamiento.
 
 llena. Incluye soporte a tipos MINE, color, POP3; encadenamiento de
 mensajes, teclas configurables y clasificaciones por encadenamiento.
 

-%description -l fr
-mutt est un client courrier Unix plein écran, petit mais très
+%description -l fr.UTF-8
+mutt est un client courrier Unix plein écran, petit mais très

 puissant. Il dispose de la gestion MIME, des couleurs, de la gestion
 puissant. Il dispose de la gestion MIME, des couleurs, de la gestion

-POP, des fils de discussion, des touches liées et d'un mode de tri sur
+POP, des fils de discussion, des touches liées et d'un mode de tri sur

 les fils.
 
 les fils.
 

-%description -l ko
-Mutt´Â ÀÛÁö¸¸ ¸Å¿ì °­·ÂÇÑ ÅؽºÆ® ±â¹ÝÀÇ ¸ÞÀÏ Å¬¶óÀ̾ðÆ®ÀÌ´Ù. Mutt´Â
-¸¹Àº ¼³Á¤ÀÌ °¡´ÉÇÏ´Ù. ±×¸®°í, Å°¹ÙÀεù, Å°º¸µå ¸ÞÅ©·Î, ¸ÞÀÏ ½º·¹µù°ú
-°°Àº Áøº¸µÈ ÇüÅÂ¿Í Á¤±ÔÇ¥Çö½Ä °Ë»ö, ¸ÞÀÏ¿¡¼­ ¼±ÅÃµÈ ±×·ìÀÇ ³»¿ë¿¡¼­
-°­·ÂÇÏ°Ô ÀÏÁ¤ÇÑ ÆÐÅÏÀ» ã¾Æ³»´Â °ÍÀ» Áö¿øÇÔÀ¸·Î½á ¸ÞÀÏÀÇ ÆÄ¿ö À¯Àú¿¡°Ô
-°¡Àå ÀûÇÕÇÏ´Ù.
+%description -l ko.UTF-8
+Mutt는 작지만 매우 강력한 텍스트 기반의 메일 클라이언트이다. Mutt는
+많은 설정이 가능하다. 그리고, 키바인딩, 키보드 메크로, 메일 스레딩과
+같은 진보된 형태와 정규표현식 검색, 메일에서 선택된 그룹의 내용에서
+강력하게 일정한 패턴을 찾아내는 것을 지원함으로써 메일의 파워 유저에게
+가장 적합하다.

 
 

-%description -l pl
+%description -l pl.UTF-8

 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,

-posiadaj±cym du¿e mo¿liwo¶ci. Obs³uguje MIME, POP3, cztery formaty
-skrzynek pocztowych, kolory, w±tki, ocenê wa¿no¶ci listów (scoring)
+posiadającym duże możliwości. Obsługuje MIME, POP3, cztery formaty
+skrzynek pocztowych, kolory, wątki, ocenę ważności listów (scoring)

 oraz skompresowane foldery.
 
 oraz skompresowane foldery.
 

-%description -l pt_BR
-O Mutt é um pequeno mas muito poderoso cliente de correio em tela
+%description -l pt_BR.UTF-8
+O Mutt é um pequeno mas muito poderoso cliente de correio em tela

 cheia. Inclui suporte a tipos MIME, cor, POP3, encadeamento de
 cheia. Inclui suporte a tipos MIME, cor, POP3, encadeamento de

-mensagens, teclas configuráveis e classificação por encadeamento.
-
-%description -l ru
-Mutt - ÜÔÏ ÎÅÂÏÌØÛÏÊ, ÎÏ ÍÏÝÎÙÊ ÐÏÌÎÏÜËÒÁÎÎÙÊ ÐÏÞÔÏ×ÙÊ ËÌÉÅÎÔ.
-÷ËÌÀÞÁÅÔ ÐÏÄÄÅÒÖËÕ MIME, Ã×ÅÔ, ÐÏÄÄÅÒÖËÕ POP3 É IMAP, ÇÒÕÐÐÉÒÏ×ËÕ
-ÓÏÏÂÝÅÎÉÊ ÐÏ ÃÅÐÏÞËÁÍ, ÐÅÒÅÏÐÒÅÄÅÌÑÅÍÙÅ ËÌÁ×ÉÛÉ, ÐÏÄÄÅÒÖËÕ pgp/gpg É
-ÓÏÒÔÉÒÏ×ËÕ ÓÏÏÂÝÅÎÉÊ × ÃÅÐÏÞËÁÈ. ÷ËÌÀÞÁÅÔ ÔÁËÖÅ (ÐÏËÁ ÞÔÏ
-ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÕÀ) ÐÏÄÄÅÒÖËÕ NNTP.
-
-%description -l tr
-Mutt, küçük ama çok güçlü bir tam-ekran Unix mektup istemcisidir. MIME
-desteði, renk ve POP3 desteði içerir.
-
-%description -l uk
-Mutt - ÃÅ ÎÅ×ÅÌÉËÉÊ, ÁÌÅ ÐÏÔÕÖÎÉÊ ÐÏ×ÎÏÅËÒÁÎÎÉÊ ÐÏÛÔÏ×ÉÊ Ë̦¤ÎÔ.
-í¦ÓÔÉÔØ Ð¦ÄÔÒÉÍËÕ MIME, ËÏ̦Ò, ЦÄÔÒÉÍËÕ POP3 ÔÁ IMAP, ÇÒÕÐÕ×ÁÎÎÑ
-ÐÏצÄÏÍÌÅÎØ ÐÏ ÌÁÎÃÀÖËÁÍ, ÐÅÒÅ×ÉÚÎÁÞÅÎÎÑ ËÌÁצÛ, ЦÄÔÒÉÍËÕ pgp/gpg ÔÁ
-ÓÏÒÔÕ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ Õ ÌÁÎÃÀÖËÁÈ. í¦ÓÔÉÔØ ÔÁËÏÖ (ÐÏËÉ ÝÏ
-ÅËÓÐÅÒÉÍÅÎÔÁÌØÎÕ) ЦÄÔÒÉÍËÕ NNTP.
+mensagens, teclas configuráveis e classificação por encadeamento.
+
+%description -l ru.UTF-8
+Mutt - это небольшой, но мощный полноэкранный почтовый клиент.
+Включает поддержку MIME, цвет, поддержку POP3 и IMAP, группировку
+сообщений по цепочкам, переопределяемые клавиши, поддержку pgp/gpg и
+сортировку сообщений в цепочках. Включает также (пока что
+экспериментальную) поддержку NNTP.
+
+%description -l tr.UTF-8
+Mutt, küçük ama çok güçlü bir tam-ekran Unix mektup istemcisidir. MIME
+desteği, renk ve POP3 desteği içerir.
+
+%description -l uk.UTF-8
+Mutt - це невеликий, але потужний повноекранний поштовий клієнт.
+Містить підтримку MIME, колір, підтримку POP3 та IMAP, групування
+повÑ\96домленÑ\8c по ланÑ\86Ñ\8eжкам, пеÑ\80евизнаÑ\87еннÑ\8f клавÑ\96Ñ\88, пÑ\96дÑ\82Ñ\80имкÑ\83 pgp/gpg Ñ\82а
+сортування повідомлень у ланцюжках. Містить також (поки що
+експериментальну) підтримку NNTP.

 
 %prep
 
 %prep

-%setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
+%setup -q
+%patch0 -p1

 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1


@@ -140,16 +152,19 @@ Mutt - 
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1

-#%patch13 -p0
+%patch13 -p1

 %patch14 -p1
 %patch15 -p1
 %patch14 -p1
 %patch15 -p1

-%patch16 -p1
+%{?with_nntp:%patch16 -p1}
+%{?with_home_etc:%patch17 -p1}

 %patch18 -p1
 %patch18 -p1

-%{?with_sasl:%patch19 -p1}
-%{?with_nntp:%patch20 -p1}
-%{?with_esmtp:%patch21 -p1}
-%{?with_home_etc:%patch22 -p1}
-%patch23 -p1
+%patch19 -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}

 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}


@@ -157,51 +172,54 @@ rm -f doc/{manual*.html,manual.txt}
 %build
 %{__aclocal} -I m4
 %{__autoconf}
 %build
 %{__aclocal} -I m4
 %{__autoconf}

+%{__autoheader}

 %{__automake}
 %configure \
 %{__automake}
 %configure \

+       mutt_cv_groupwrite=yes \
+       mutt_cv_worldwrite=no \

        %{!?debug:--disable-debug} %{?debug:--enable-debug} \
        %{!?debug:--disable-debug} %{?debug:--enable-debug} \

-       %{!?with_slang:--with-curses} \
-       %{?with_slang:--with-slang} \
+       --disable-warnings \

        --enable-compressed \
        --enable-external-dotlock \
        --enable-compressed \
        --enable-external-dotlock \

+       --enable-gpgme \
+       --enable-hcache \

        --enable-imap \
        --enable-imap \

-       --without-included-gettext \

        --enable-mailtool \
        --enable-mailtool \

-       --with-mixmaster \
-       --enable-pop \

        %{?with_nntp:--enable-nntp} \
        %{?with_nntp:--enable-nntp} \

-       --with-regex \
-       %{?with_sasl:--with-sasl} %{!?with_sasl:--without-sasl} \
-       %{?with_home_etc:--with-home-etc} %{!?with_home_etc:--without-home-etc} \
-       %{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
-       --with-ssl \
-       --disable-warnings \
-       --with-docdir=%{_docdir}/%{name}-%{version} \
-       --with-homespool=Maildir \
+       --enable-pop \
+       --enable-smtp \
+       --with-bdb=/usr --without-gdbm \
+       %{!?with_slang:--with-curses} \
+       --with-docdir=%{_docdir}/%{name} \
+       %{?with_home_etc:--with-home-etc} \

        --with-mailpath=/var/mail \
        --with-mailpath=/var/mail \

-       --with-sharedir=%{_datadir} \
-       --prefix=%{_prefix} \
-       --bindir=%{_bindir} \
-       --datadir=%{_datadir} \
-       --mandir=%{_mandir} \
-       --sysconfdir=%{_sysconfdir}
+       --with-mixmaster \
+       --with-regex \
+       %{?with_sasl:--with-sasl2} \
+       %{?with_slang:--with-slang} \
+       --with-ssl

 
 

+%{__make} -j1 -C doc

 %{__make}
 %{__make}

-%{__make} manual.txt -C doc

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
 
 %{__make} install \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
 
 %{__make} install \

-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       DOTLOCK_GROUP=

 
 

-%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH17
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12}

 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 

+# 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
+

 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 


@@ -214,14 +232,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)

-%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt README.xface %{?with_esmtp: Muttrc.esmtp}
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface

 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
 %attr(755,root,root) %{_bindir}/pgp*
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
 %attr(755,root,root) %{_bindir}/pgp*

+%attr(755,root,root) %{_bindir}/smime_keys

 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 

+%{_docdir}/%{name}

 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*