X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=24d805da1cbdccfca91f0a85a83f36a18012f66c;hp=0f94db09fe0f2a55c76019e4f66cf56f194cb3bc;hb=1ad845057f4f1087de4ccedc594ea3db751b180e;hpb=68eeb8559b87ef7d8c68bb3b42439a874f64f62a

diff --git a/mutt.spec b/mutt.spec
index 0f94db0..24d805d 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,74 +1,85 @@
 #
+# TODO:
+# - rework -cd.signatures_menu.patch 
+# - finish -folder_columns.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_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(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
+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
-Version:	1.5.14
-Release:	1
+Version:	1.5.19
+Release:	0.1
 Epoch:		6
-License:	GPL
+License:	GPL v2+
 Group:		Applications/Mail
 Source0:	ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5:	6d33b4f0074e39772021d947c49b30c6
+# Source0-md5:	73b3747bc7f7c805921e8d24ebac693f
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
-#Patch0:		%{name}-pl.po-update.patch
+Patch0:		%{name}-pl.po-update.patch
 Patch1:		%{name}-forcedotlock.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
-Patch9:		%{name}-folder_columns.patch
-Patch10:	%{name}-nr.tag_prefix_cond.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
-Patch16:	%{name}-vvv.nntp.patch
-Patch17:	%{name}-esmtp.patch
-Patch18:	%{name}-home_etc.patch
-#PatchXXX:	%{name}-pgp_hook.patch
+Patch12:	%{name}-xface.patch
+Patch13:	%{name}-Muttrc_mbox_path.patch
+Patch14:	%{name}-po.patch
+# http://mutt.org.ua/download/
+Patch15:	%{name}-vvv.nntp.patch
+Patch16:	%{name}-home_etc.patch
+Patch17:	%{name}-Muttrc.patch
+Patch18:	%{name}-muttbug-tmp.patch
+Patch19:	%{name}-folder_columns.patch
+Patch20:	%{name}-imap_mxcmp.patch
+Patch21:	%{name}-imap_recent.patch
+Patch22:	%{name}-Muttrc.head.patch
+Patch23:	%{name}-smime.rc.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
-BuildRequires:	db-devel
+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
-BuildRequires:	gpgme-devel >= 1:1.0.0
+BuildRequires:	gpgme-devel >= 1:1.1.0
 BuildRequires:	libidn-devel
 BuildRequires:	lynx
 %{!?with_slang:BuildRequires:	ncurses-devel >= 5.0}
 BuildRequires:	openssl-devel >= 0.9.7d
 %{?with_slang:BuildRequires:	slang-devel}
-%{?with_esmtp:BuildRequires:	libesmtp-devel}
-BuildRequires:	docbook-style-xsl
 BuildRequires:	libxslt-progs
-BuildRequires:	sgml-tools
-BuildRequires:	sgml-tools-dtd
 Requires:	iconv
-Requires:	mailcap
 %{?with_home_etc:Requires:	home-etc >= 1.0.8}
+Suggests:	mailcap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	 -fomit-frame-pointer 
@@ -132,7 +143,7 @@ Mutt - це невеликий, але потужний повноекранни
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -140,19 +151,24 @@ Mutt - це невеликий, але потужний повноекранни
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-# breaks display if arrow_cursor is set
-%{?with_folder_column:%patch9 -p1}
-# disabled - changes default behaviour
-#%patch10 -p0
+# XXX: needs update (searchBuf was removed from MUTTMENU struct in 1.5.19)
+#%%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
-%{?with_nntp:%patch16 -p1}
-%{?with_esmtp:%patch17 -p1}
-%{?with_home_etc:%patch18 -p1}
+%{?with_nntp:%patch15 -p1}
+%{?with_home_etc:%patch16 -p1}
+%patch17 -p1
+%patch18 -p1
+# breaks display if arrow_cursor is set
+%{?with_folder_column:%patch19 -p1}
+%patch20 -p1
+%{?with_imap_recent:%patch21 -p1}
+%patch22 -p1
+%patch23 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -163,45 +179,60 @@ rm -f doc/{manual*.html,manual.txt}
 %{__autoheader}
 %{__automake}
 %configure \
+	mutt_cv_groupwrite=yes \
+	mutt_cv_worldwrite=no \
 	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
 	--disable-warnings \
 	--enable-compressed \
 	--enable-external-dotlock \
 	--enable-gpgme \
+	--enable-hcache \
 	--enable-imap \
 	--enable-mailtool \
 	%{?with_nntp:--enable-nntp} \
 	--enable-pop \
-	--enable-hcache \
+	--enable-smtp \
+	--with-bdb=/usr \
+	--without-gdbm \
 	%{!?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_home_etc:--with-home-etc} \
 	--with-mailpath=/var/mail \
-	--with-regex \
 	--with-mixmaster \
-	%{?with_sasl:--with-sasl2} \
-	--with-ssl \
-	--without-included-gettext
+	--with-regex \
+	%{?with_sasl:--with-sasl} \
+	%{?with_slang:--with-slang} \
+	--with-ssl
 
+%{__make} -j1 -C doc
 %{__make}
-%{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	DOTLOCK_GROUP=
+
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH17}
 
-%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12}
+install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
+install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
+install contrib/colors.linux $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d/colors.rc
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
+cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/mutt_source-muttrc.d
+#!/bin/sh -e
+for rc in /etc/Muttrc.d/*.rc; do
+	test -r "$rc" && echo "source \"$rc\""
+done
+EOF
+
 # 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
@@ -218,9 +249,12 @@ 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 README.xface %{?with_esmtp:Muttrc.esmtp}
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface
+%dir %{_sysconfdir}/Muttrc.d
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
+%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc.d/*.rc
 %attr(755,root,root) %{_bindir}/mutt
+%attr(755,root,root) %{_bindir}/mutt_source-muttrc.d
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
 %attr(755,root,root) %{_bindir}/pgp*