X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=ad46220b6eea525d9ff26f4078796b544eb80ac5;hp=04ff5c4e4f949b2e8fcb137b9e9fe94753cf02a7;hb=3fa58360756bc692099e948e979a7bb1bfc35697;hpb=65def7e36a662f3b21cbef5eb43fc8ee9a56cd24

diff --git a/mutt.spec b/mutt.spec
index 04ff5c4..ad46220 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,27 +1,34 @@
-# conditionals:
-# --with slang:	use slang library instead of ncurses
-# --with nntp:	use VVV's NNTP patch
-
+#
+# 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(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.4.1
-Release:	1
-Epoch:		5
+Version:	1.4.2.1
+Release:	10
+Epoch:		6
 License:	GPL
 Group:		Applications/Mail
 Source0:	ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
+# Source0-md5:	710bd56d3c4c4bcd1403bc4e053f7476
 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
@@ -35,27 +42,38 @@ 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
+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}-missing_includes.patch
 URL:		http://www.mutt.org/
+%{!?with_slang:BuildRequires:	ncurses-devel >= 5.4-0.7}
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
+%{?with_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}
+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:	smtpdaemon
 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,
@@ -77,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.
 
+%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
@@ -120,14 +145,22 @@ Mutt - 
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-#%patch13 -p0
+# breaks display if arrow_cursor is set
+%{?with_folder_column:%patch12 -p1}
+# disabled - changes default behaviour
+##%patch13 -p0
 %patch14 -p1
-#%patch15 -p1
+%patch15 -p1
 %patch16 -p1
-%patch18 -p1
-%{!?_without_sasl:%patch19 -p1}
-%{?_with_nntp:%patch20 -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}
@@ -135,11 +168,12 @@ rm -f doc/{manual*.html,manual.txt}
 %build
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
-	%{!?_with_slang:--with-curses} \
-	%{?_with_slang:--with-slang} \
+	--%{?debug:en}%{!?debug:dis}able-debug \
+	%{!?with_slang:--with-curses} \
+	%{?with_slang:--with-slang} \
 	--enable-compressed \
 	--enable-external-dotlock \
 	--enable-imap \
@@ -147,12 +181,14 @@ rm -f doc/{manual*.html,manual.txt}
 	--enable-mailtool \
 	--with-mixmaster \
 	--enable-pop \
-	%{?_with_nntp:--enable-nntp} \
+	%{?with_nntp:--enable-nntp} \
 	--with-regex \
-	%{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
+	--with%{!?with_sasl:out}-sasl \
+	--with%{!?with_home_etc:out}-home-etc \
+	%{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
 	--with-ssl \
 	--disable-warnings \
-	--with-docdir=%{_docdir}/%{name}-%{version} \
+	--with-docdir=%{_docdir}/%{name} \
 	--with-homespool=Maildir \
 	--with-mailpath=/var/mail \
 	--with-sharedir=%{_datadir} \
@@ -167,21 +203,25 @@ rm -f doc/{manual*.html,manual.txt}
 
 %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
 
-%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH17
+%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+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*
 
-rm -f $RPM_BUILD_ROOT/etc/mime.types
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 
 %find_lang %{name}
 
@@ -190,15 +230,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
-%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
 
-%{_applnkdir}/Network/Mail/mutt.desktop
+%{_docdir}/%{name}
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*