X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mutt.spec;h=23d8b68298572b3fbaa85ba497f4a63da109d7ae;hb=60e28a7a2bad34eb2e42a1ccbde3a2f8c97f5fe3;hp=4fb7c1d909bb70ddcdd5ac69df78fb13f17be4fe;hpb=62e6a37a1c316395316f537b0279f138a6f4287d;p=packages%2Fmutt.git

diff --git a/mutt.spec b/mutt.spec
index 4fb7c1d..23d8b68 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,57 +1,74 @@
+#
+# 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(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
 Name:		mutt
-Version:	1.2.5i
-Release:	6
-Epoch:		4
+Version:	1.5.11
+Release:	0.1
+Epoch:		6
 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/devel/%{name}-%{version}.tar.gz
+# Source0-md5:	00e6f8f7c37d4840e5e30583ebee21ce
 Source1:	%{name}.desktop
-Source2:	patches_sec.txt
-Source3:	patches_bj.txt
-Source4:	%{name}.png
-#Patch0:	%{name}-mail.patch
-#Patch1:	%{name}-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:		%{name}-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/%{name}_package.tar.gz
-Patch25:	%{name}-dot-lock.patch
-Patch26:	%{name}-pl.po.patch
-Patch27:	%{name}-nosetgid.patch
-Patch28:	%{name}-md5.patch
-Patch29:	%{name}-imap.patch
-Patch30:	%{name}-amfix.patch
+Source2:	%{name}.png
+Source3:	%{name}.1.pl
+Patch0:		%{name}-pl.po-update.patch
+Patch1:		%{name}-forcedotlock.patch
+Patch2:		%{name}-rr.compressed.patch
+Patch3:		%{name}-bj.status-time.patch
+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
+Patch9:		%{name}-folder_columns.patch
+Patch10:	%{name}-nr.tag_prefix_cond.patch
+Patch11:	%{name}-manual.patch
+Patch12:	%{name}-send_charset.patch
+Patch13:	%{name}-xface.patch
+Patch14:	%{name}-Muttrc_mbox_path.patch
+Patch15:	%{name}-po.patch
+Patch16:	%{name}-vvv.nntp.patch
+Patch17:	%{name}-esmtp.patch
+#Patch18:	%{name}-home_etc.patch
+# if some fuctionality is still missing, patch must be rewritten
+#PatchXXX:	%{name}-pgp_hook.patch
 URL:		http://www.mutt.org/
-Requires:	smtpdaemon
-Requires:	mailcap
-BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	openssl-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+%{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
+%{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
+BuildRequires:	gettext-devel
+BuildRequires:	gpgme-devel >= 1:1.0.0
+BuildRequires:	libidn-devel
+%{!?with_slang:BuildRequires:	ncurses-devel >= 5.0}
+BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	sgml-tools
+BuildRequires:	sgml-tools-dtd
+%{?with_slang:BuildRequires:	slang-devel}
+%{?with_esmtp:BuildRequires:	libesmtp-devel}
+Requires:	iconv
+Requires:	mailcap
+#%{?with_home_etc:Requires:	home-etc >= 1.0.8}
 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.
@@ -63,86 +80,133 @@ 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
 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
+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 
+%setup -q
+###%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 %patch7 -p1
-%patch9 -p0
-%patch10 -p0
+%patch8 -p1
+# breaks display if arrow_cursor is set
+%{?with_folder_column:%patch9 -p1}
+# disabled - changes default behaviour
+#%patch10 -p0
+%patch11 -p1
 %patch12 -p1
+%patch13 -p1
 %patch14 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p0
-%patch20 -p1
-%patch22 -p1
-#%patch23 -p0
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
+%patch15 -p1
+%{?with_nntp:%patch16 -p1}
+%{?with_esmtp:%patch17 -p1}
+#%{?with_home_etc:%patch18 -p1}
+
+# force regeneration (manual.sgml is modified by some patches)
+rm -f doc/{manual*.html,manual.txt}
 
 %build
-aclocal
-autoconf
-automake -a -c
-CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} -fno-strict-aliasing"
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--with-sharedir=%{_datadir} \
-	--enable-pop \
-	--enable-imap \
-	--with-curses \
+	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
 	--disable-warnings \
-	--disable-domain \
-        --enable-compressed \
+	--enable-compressed \
+	--enable-external-dotlock \
+	--enable-gpgme \
+	--enable-imap \
+	--enable-mailtool \
+	%{?with_nntp:--enable-nntp} \
+	--enable-pop \
+	--enable-hcache \
+	%{!?with_slang:--with-curses} \
+	%{?with_slang:--with-slang} \
+	--with-docdir=%{_docdir}/%{name} \
+	%{?with_home_etc:--with-home-etc} %{!?with_home_etc:--without-home-etc} \
+	--with-homespool=Maildir \
+	%{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
 	--with-mailpath=/var/mail \
-	--with-homespool=Mailbox \
+	--with-regex \
+	--with-mixmaster \
+	%{?with_sasl:--with-sasl2} \
 	--with-ssl \
-	--with-charmaps \
-	--with-docdir=%{_defaultdocdir}/%{name}-%{version} \
-	--enable-external-dotlock \
-	--enable-locales-fix
+	--without-included-gettext
 
-%{__make} keymap.h
-%{__make} 
+%{__make}
+%{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-install %{SOURCE2} %{SOURCE3} .
+# 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
 
-gzip -9nf 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}
 
@@ -151,13 +215,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz contrib/{*rc*,*cap*} doc/manual*html
-%config(noreplace) %verify(not size md5 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 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
-%attr(755,root,root) %{_bindir}/pgpewrap
-%attr(755,root,root) %{_bindir}/pgpring
-%attr(755,root,root) %{_bindir}/mutt_dotlock
-
-%{_applnkdir}/Network/Mail/mutt.desktop
+%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
+
+%{_docdir}/%{name}
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
+%lang(pl) %{_mandir}/pl/man*/*