X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=93f8111136ae3fa10c28c000d6c95d372c7ee6a8;hp=413733eb4186dca94142a4b6412c82a8ea4e14b4;hb=fb11449b56a4f6641284d5318bcc0cc942df21ab;hpb=b21e5dadf31bba75a44158c5d128c0a235832eea

diff --git a/mutt.spec b/mutt.spec
index 413733e..93f8111 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,50 +1,61 @@
+# conditionals:
+# --with slang:	use slang library instead of ncurses
+# --with nntp:	use VVV's NNTP patch
+
 Summary:	The Mutt Mail User Agent
-Summary(de):	Der 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(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
 Name:		mutt
-Version:	1.2.4i
-Release:	1
-Epoch:		2
+Version:	1.4
+Release:	5.2
+Epoch:		5
 License:	GPL
 Group:		Applications/Mail
-Group(pt):	Aplicações/Correio Eletrônico
-Group(pl):	Aplikacje/Poczta
-Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
-Source1:	mutt.desktop
-Source2:	patches_sec.txt
-Source3:	patches_bj.txt
-Patch0:		mutt-mail.patch
-#Patch1:	mutt-confdir.patch
-Patch2:		http://www.spinnaker.de/mutt/patch-1.2.rr.compressed.1.gz
-# Part of that patches I changed by hand to fit them into newer version
-# (bonkey)
-Patch3:		patch-0.00.sec+bonk.patchlist.1
-Patch4:		mutt-blanklines.patch
-Patch7:		http://sec.42.org/mutt/patch-0.94.7.sec.previous_jump.1
-Patch9:		http://sec.42.org/mutt/patch-0.94.7.vikas.word_chars.1
-Patch10:	http://sec.42.org/mutt/patch-0.95.3.bj.ed_mtime.1
-Patch12:	http://sec.42.org/mutt/patch-0.95.4.bj.status-time.1
-Patch14:	http://sec.42.org/mutt/patch-0.95.4.sec.keypad.1
-Patch16:	http://sec.42.org/mutt/patch-0.95.4.sec.reverse_reply.1
-Patch17:	http://sec.42.org/mutt/patch-0.95.4.vikas.print_index.1
-Patch18:	http://sec.42.org/mutt/patch-0.95.6.as.mark-old.1
-Patch19:	http://sec.42.org/mutt/patch-0.95.bj.hash_destroy.2
-Patch20:	http://sec.42.org/mutt/patch-0.95.sec.condense_pgp.1
-Patch22:	http://sec.42.org/mutt/patch-1.02.sec._A.1
-#Patch23:	http://www.murkworks.to/blank-line.patch
-#Patch24:	http://www.albedo.art.pl/~kbryd/mutt/mutt_package.tar.gz
-Patch25:	mutt-dot-lock.patch
-Patch26:	mutt-pl.po.patch
+Source0:	ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
+Source1:	%{name}.desktop
+Source2:	%{name}.png
+Source3:	%{name}.1.pl
+Patch0:		%{name}-home_etc.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
 URL:		http://www.mutt.org/
-Requires:	smtpdaemon
+BuildRequires:	autoconf
+BuildRequires:	automake
+%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
+BuildRequires:	gettext-devel
+%{!?_with_slang:BuildRequires:		ncurses-devel >= 5.0}
+BuildRequires:	openssl-devel >= 0.9.7
+BuildRequires:	sgml-tools
+%{?_with_slang:BuildRequires:		slang-devel}
+Requires:	iconv
 Requires:	mailcap
-BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	openssl-devel
+Requires:	smtpdaemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
 Features include MIME support, color, POP3 support, message threading,
@@ -55,6 +66,11 @@ Mutt ist ein kleiner aber leistungsf
 Unix mit MIME-Unterstützung, Farbe, POP3-Unterstützung,
 Nachrichten-Threading, zuweisbaren Tasten und Sortieren nach Threads.
 
+%description -l es
+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.
+
 %description -l fr
 mutt est un client courrier Unix plein écran, petit mais très
 puissant. Il dispose de la gestion MIME, des couleurs, de la gestion
@@ -62,75 +78,110 @@ POP, des fils de discussion, des touches li
 les fils.
 
 %description -l pl
-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)
 oraz skompresowane foldery.
 
+%description -l pt_BR
+O Mutt é um pequeno mas muito poderoso cliente de correio em tela
+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.
+
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
-%patch0 -p0
-#%patch1 -p1 
-%patch2 -p1 
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 %patch7 -p1
-%patch9 -p0
-%patch10 -p0
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 %patch12 -p1
+#%patch13 -p0
 %patch14 -p1
+%patch15 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
-%patch19 -p0
-%patch20 -p1
-%patch22 -p1
-#%patch23 -p0
-%patch25 -p1
-%patch26 -p1
+%{!?_without_sasl:%patch19 -p1}
+%{?_with_nntp:%patch20 -p1}
+
+# force regeneration (manual.sgml is modified by some patches)
+rm -f doc/{manual*.html,manual.txt}
 
 %build
-mv aclocal.m4 acinclude.m4
-aclocal
-automake
-autoconf
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-LDFLAGS="-s"
-export CFLAGS LDFLAGS
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
 %configure \
-	--with-sharedir=%{_datadir} \
-	--enable-pop \
+	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
+	%{!?_with_slang:--with-curses} \
+	%{?_with_slang:--with-slang} \
+	--enable-compressed \
+	--enable-external-dotlock \
 	--enable-imap \
-	--with-curses \
+	--without-included-gettext \
+	--enable-mailtool \
+	--with-mixmaster \
+	--enable-pop \
+	%{?_with_nntp:--enable-nntp} \
+	--with-regex \
+	%{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
+	--with-ssl \
 	--disable-warnings \
-	--disable-domain \
-        --enable-compressed \
+	--with-docdir=%{_docdir}/%{name}-%{version} \
+	--with-homespool=Maildir \
 	--with-mailpath=/var/mail \
-	--with-homespool=Mailbox \
-	--with-ssl \
-	--with-charmaps \
-	--with-docdir=%{_defaultdocdir}/%{name}-%{version}
+	--with-sharedir=%{_datadir} \
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--datadir=%{_datadir} \
+	--mandir=%{_mandir} \
+	--sysconfdir=%{_sysconfdir}
 
-%{__make} keymap.h
-%{__make} 
+%{__make}
+%{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
+	$RPM_BUILD_ROOT%{_mandir}/pl/man1
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
+%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH17
+
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
-install %{SOURCE2} %{SOURCE3} .
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-	contrib/{*rc*,*cap*} \
-	ChangeLog README TODO NEWS README.SECURITY README.SSL README.UPGRADE \
-	patches_{bj,sec}.txt
+# conflict with qmail
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
+
+rm -f $RPM_BUILD_ROOT/etc/mime.types
 
 %find_lang %{name}
 
@@ -139,13 +190,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc {ChangeLog,README,TODO,NEWS,README.SECURITY,README.SSL,README.UPGRADE}.gz
-%doc contrib/{*rc*,*cap*}
-%doc doc/manual*html
-%doc patches_{bj,sec}.txt.gz
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt 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*
+%attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
-%config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/Muttrc
 %{_applnkdir}/Network/Mail/mutt.desktop
-
-%attr(755,root,root) %{_bindir}/*
+%{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
+%lang(pl) %{_mandir}/pl/man*/*