- added sasl-fixes patch (backport from 1.5.x, spotted by Mariusz Krynski)

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 49a7cf7fa9591aaf0d412028062a6c4cabafe3ef..cab96a5f26830b4f8bf07f80fba7e8c1849a8056 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,36 +1,79 @@
+#
+# 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_with    folder_column   # build with folder_column patch
+%bcond_without sasl            # don't use sasl
+%bcond_without home_etc        # don't use home_etc
+#

 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:       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(pl):   Program pocztowy Mutt
 Summary(pt_BR):        Mutt, cliente de correio eletrônico

-Summary(es):   Mutt, cliente de correo electrónico
+Summary(ru):   ðÏÞÔÏ×ÁÑ ËÌÉÅÎÔÓËÁÑ ÐÒÏÇÒÁÍÍÁ Mutt

 Summary(tr):   Mutt elektronik posta programý
 Summary(tr):   Mutt elektronik posta programý

+Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt

 Name:          mutt
 Name:          mutt

-Version:       1.3.26i
+Version:       1.4.2.2

 Release:       1
 Release:       1

-Epoch:         1
+Epoch:         6

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

-Group(de):     Applikationen/Post
-Group(pl):     Aplikacje/Poczta
-Group(pt):     Aplicações/Correio Eletrônico
-Source0:       ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
+# Source0-md5: 51a08429c5bd5c34af3f4268b8cbcda3

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

-Patch0:                %{name}-home_etc.patch
+Patch0:                %{name}-paths.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}-pgp_hook.patch
+Patch15:       %{name}-manual.patch
+Patch16:       %{name}-send_charset.patch
+Patch17:       %{name}-xface.patch
+Patch18:       %{name}-sasl2.patch
+Patch19:       %{name}-nntp.patch
+Patch20:       %{name}-esmtp.patch
+Patch21:       %{name}-home_etc.patch
+Patch22:       %{name}-kill_warnings.patch
+Patch23:       %{name}-Muttrc_mbox_path.patch
+Patch24:       %{name}-po.patch
+Patch25:       %{name}-sasl-fixes.patch

 URL:           http://www.mutt.org/
 URL:           http://www.mutt.org/

+%{!?with_slang:BuildRequires:  ncurses-devel >= 5.4-0.7}

 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: automake

-BuildRequires: ncurses-devel >= 5.0
-BuildRequires: openssl-devel >= 0.9.6a
-%{!?_without_sasl:BuildRequires:       cyrus-sasl-devel}
+%{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.1.0}
+BuildRequires: gettext-devel
+BuildRequires: groff
+%{?with_home_etc:BuildRequires:        home-etc-devel >= 1.0.8}
+%{?with_esmtp:BuildRequires:   libesmtp-devel}
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: sgml-tools >= 1.0.9-20
+BuildRequires: sgml-tools-dtd
+%{?with_slang:BuildRequires:   slang-devel}
+%{?with_home_etc:Requires:     home-etc >= 1.0.8}

 Requires:      iconv
 Requires:      mailcap
 Requires:      iconv
 Requires:      mailcap

-Requires:      smtpdaemon

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+%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,
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
 Features include MIME support, color, POP3 support, message threading,


@@ -52,6 +95,13 @@ 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
 les fils.
 
 POP, des fils de discussion, des touches liées et d'un mode de tri sur
 les fils.
 

+%description -l ko
+Mutt´Â ÀÛÁö¸¸ ¸Å¿ì °­·ÂÇÑ ÅؽºÆ® ±â¹ÝÀÇ ¸ÞÀÏ Å¬¶óÀ̾ðÆ®ÀÌ´Ù. Mutt´Â
+¸¹Àº ¼³Á¤ÀÌ °¡´ÉÇÏ´Ù. ±×¸®°í, Å°¹ÙÀεù, Å°º¸µå ¸ÞÅ©·Î, ¸ÞÀÏ ½º·¹µù°ú
+°°Àº Áøº¸µÈ ÇüÅÂ¿Í Á¤±ÔÇ¥Çö½Ä °Ë»ö, ¸ÞÀÏ¿¡¼­ ¼±ÅÃµÈ ±×·ìÀÇ ³»¿ë¿¡¼­
+°­·ÂÇÏ°Ô ÀÏÁ¤ÇÑ ÆÐÅÏÀ» ã¾Æ³»´Â °ÍÀ» Áö¿øÇÔÀ¸·Î½á ¸ÞÀÏÀÇ ÆÄ¿ö À¯Àú¿¡°Ô
+°¡Àå ÀûÇÕÇÏ´Ù.
+

 %description -l pl
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
 posiadaj±cym du¿e mo¿liwo¶ci. Obs³uguje MIME, POP3, cztery formaty
 %description -l pl
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
 posiadaj±cym du¿e mo¿liwo¶ci. Obs³uguje MIME, POP3, cztery formaty


@@ -63,62 +113,116 @@ O Mutt 
 cheia. Inclui suporte a tipos MIME, cor, POP3, encadeamento de
 mensagens, teclas configuráveis e classificação por encadeamento.
 
 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 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.
+

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

+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+# breaks display if arrow_cursor is set
+%{?with_folder_column:%patch12 -p1}
+# disabled - changes default behaviour
+##%patch13 -p0
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%{?with_sasl:%patch18 -p1}
+%{?with_nntp:%patch19 -p1}
+%{?with_esmtp:%patch20 -p1}
+%{?with_home_etc:%patch21 -p1}
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+
+# force regeneration (manual.sgml is modified by some patches)
+rm -f doc/{manual*.html,manual.txt}

 
 %build
 
 %build

-
-#PGP=%{_bindir}/pgp PGPK=%{_bindir}/pgpk \
-CFLAGS="%{optflags} -I%{_includedir}/slang" \
-./configure \
-       --enable-pop \
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --%{?debug:en}%{!?debug:dis}able-debug \
+       %{!?with_slang:--with-curses} \
+       %{?with_slang:--with-slang} \
+       --enable-compressed \
+       --enable-external-dotlock \

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

+       --without-included-gettext \

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

-       --enable-external-dotlock \
-       %{!?debug:--disable-debug} %{?debug:--enable-debug} \
-       --disable-warnings \
-       --with-curses \
-       --with-iconv \
+       --with-mixmaster \
+       --enable-pop \
+       %{?with_nntp:--enable-nntp} \

        --with-regex \
        --with-regex \

+       --with%{!?with_sasl:out}-sasl \
+       --with%{!?with_home_etc:out}-home-etc \
+       %{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \

        --with-ssl \
        --with-ssl \

-       %{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
-       --without-included-nls \
+       --disable-warnings \
+       --with-docdir=%{_docdir}/%{name} \

        --with-homespool=Maildir \
        --with-homespool=Maildir \

-       --with-mixmaster \

        --with-mailpath=/var/mail \
        --with-sharedir=%{_datadir} \
        --with-mailpath=/var/mail \
        --with-sharedir=%{_datadir} \

-       --with-docdir=%{_docdir}/%{name}-%{version} \

        --prefix=%{_prefix} \
        --bindir=%{_bindir} \
        --prefix=%{_prefix} \
        --bindir=%{_bindir} \

-       --sysconfdir=%{_sysconfdir} \

        --datadir=%{_datadir} \
        --datadir=%{_datadir} \

-       --mandir=%{_mandir} 
+       --mandir=%{_mandir} \
+       --sysconfdir=%{_sysconfdir}

 
 %{__make}
 %{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make}
 %{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
-       $RPM_BUILD_ROOT%{_mandir}/pl/man1
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}

 
 

-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT

 
 

-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}

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

-gzip -9nf contrib/{*rc*,*cap*} \
-       ChangeLog README TODO NEWS README.SECURITY README.SSL 
+# 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*
 

+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
+

 %find_lang %{name}
 
 %clean
 %find_lang %{name}
 
 %clean


@@ -126,15 +230,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 *.gz contrib/{*rc*,*cap*} doc/manual*html doc/manual.txt
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface %{?with_esmtp:Muttrc.esmtp}
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_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(2755,root,mail) %{_bindir}/mutt_dotlock
 
 %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(2755,root,mail) %{_bindir}/mutt_dotlock
 

-%{_applnkdir}/Network/Mail/mutt.desktop
+%{_docdir}/%{name}
+%{_desktopdir}/*.desktop

 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*