X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=e6f3c0fbc00e77af6b5964ba621abbe36460f8e7;hp=e2f7e1daed2e81f25edef99244009d18a03f7e97;hb=9674bab9f1ec1b379a6c32a39c21b6de82d8d069;hpb=20f22e7cd35913df23b89d1949e290df628db6e3

diff --git a/mutt.spec b/mutt.spec
index e2f7e1d..e6f3c0f 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,6 +1,10 @@
 #
 # TODO:
+# - gss/heimdal
 # - finish -folder_columns.patch
+# - update/drop -home_etc.patch
+# - update/drop -nntp.patch
+# - update/drop -imap_recent.patch
 #
 # Conditional build:
 %bcond_with	slang		# use slang library instead of ncurses
@@ -8,8 +12,14 @@
 %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
+%bcond_with	home_etc	# use home_etc
+%bcond_with	gdbm		# use GDBM instead of BerkeleyDB
+%bcond_with	qdbm		# use QDBM instead of BerkeleyDB
+%bcond_with	tokyocabinet	# use TokyoCabinet instead of BerkeleyDB
 #
+%if %{without gdbm} && %{without qdbm} && %{without tokyocabinet}
+%define	with_bdb	1
+%endif
 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
@@ -21,61 +31,64 @@ Summary(ru.UTF-8):	Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.5.21
+Version:	1.11.0
 Release:	1
 Epoch:		6
 License:	GPL v2+
 Group:		Applications/Mail
-Source0:	ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5:	a29db8f1d51e2f10c070bf88e8a553fd
+# temporarily dead? (Jun 2014)
+Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+# Source0-md5:	b58fdddf76a880c6314c9d4df2c32efb
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
 Patch0:		%{name}-pl.po-update.patch
-Patch1:		%{name}-forcedotlock.patch
+Patch1:		%{name}-bj.status-time.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
+Patch2:		%{name}-vvv.quote.patch
+Patch3:		%{name}-null_name.patch
+Patch4:		%{name}-cd.signatures_menu.patch
 # http://www.mutt.ca/patches/ (dw.crypt-autoselectkey)
-Patch9:		%{name}-crypt-autoselectkey.patch
-Patch10:	%{name}-manual.patch
-Patch11:	%{name}-xface.patch
-Patch12:	%{name}-Muttrc_mbox_path.patch
-Patch13:	%{name}-po.patch
+Patch5:		%{name}-crypt-autoselectkey.patch
+Patch6:		%{name}-manual.patch
+Patch7:		%{name}-xface.patch
+Patch8:		%{name}-Muttrc_mbox_path.patch
+Patch9:		%{name}-po.patch
+Patch10:	%{name}-Muttrc.head.patch
+Patch11:	%{name}-smime.rc.patch
+Patch12:	%{name}-db.patch
+Patch13:	format-security.patch
+Patch14:	%{name}-keep_to.patch
+Patch15:	%{name}-vvv.initials.patch
+# applied during %%install
+Patch50:	%{name}-Muttrc.patch
+# bcond-related patches
+Patch101:	%{name}-home_etc.patch
 # http://mutt.org.ua/download/
-Patch14:	%{name}-vvv.nntp.patch
-Patch15:	%{name}-home_etc.patch
-Patch16:	%{name}-Muttrc.patch
-Patch17:	%{name}-muttbug-tmp.patch
-Patch18:	%{name}-folder_columns.patch
-Patch19:	%{name}-imap_recent.patch
-Patch20:	%{name}-Muttrc.head.patch
-Patch21:	%{name}-smime.rc.patch
-Patch22:	%{name}-ac.patch
+Patch102:	%{name}-vvv.nntp.patch
+Patch103:	%{name}-folder_columns.patch
+Patch104:	%{name}-imap_recent.patch
 URL:		http://www.mutt.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.54
+BuildRequires:	automake >= 1.6
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
-BuildRequires:	db-devel >= 4.0
+%{?with_bdb:BuildRequires:	db-devel >= 4.0}
 BuildRequires:	docbook-dtd42-xml
 BuildRequires:	docbook-style-xsl
+%{?with_gdbm:BuildRequires:	gdbm-devel}
+BuildRequires:	gettext-tools
+BuildRequires:	gpgme-devel >= 1:1.1.1
 %{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
-BuildRequires:	gettext-devel
-BuildRequires:	gpgme-devel >= 1:1.1.0
 BuildRequires:	libidn-devel
+BuildRequires:	libxslt-progs
 BuildRequires:	lynx
 %{!?with_slang:BuildRequires:	ncurses-devel >= 5.0}
 BuildRequires:	openssl-devel >= 0.9.7d
+%{?with_qdbm:BuildRequires:	qdbm-devel}
 %{?with_slang:BuildRequires:	slang-devel}
-BuildRequires:	libxslt-progs
+%{?with_tokyocabinet:BuildRequires:	tokyocabinet-devel}
+%{?with_home_etc:Requires:	home-etc-lib >= 1.0.8}
 Requires:	iconv
-%{?with_home_etc:Requires:	home-etc >= 1.0.8}
 Suggests:	mailcap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -103,11 +116,9 @@ POP, des fils de discussion, des touches liées et d'un mode de tri sur
 les fils.
 
 %description -l ko.UTF-8
-Mutt는 작지만 매우 강력한 텍스트 기반의 메일 클라이언트이다. Mutt는
-많은 설정이 가능하다. 그리고, 키바인딩, 키보드 메크로, 메일 스레딩과
-같은 진보된 형태와 정규표현식 검색, 메일에서 선택된 그룹의 내용에서
-강력하게 일정한 패턴을 찾아내는 것을 지원함으로써 메일의 파워 유저에게
-가장 적합하다.
+Mutt는 작지만 매우 강력한 텍스트 기반의 메일 클라이언트이다. Mutt는 많은 설정이 가능하다. 그리고, 키바인딩, 키보드
+메크로, 메일 스레딩과 같은 진보된 형태와 정규표현식 검색, 메일에서 선택된 그룹의 내용에서 강력하게 일정한 패턴을 찾아내는
+것을 지원함으로써 메일의 파워 유저에게 가장 적합하다.
 
 %description -l pl.UTF-8
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
@@ -140,6 +151,7 @@ Mutt - це невеликий, але потужний повноекранни
 
 %prep
 %setup -q
+# pl.poupdate
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -154,19 +166,17 @@ Mutt - це невеликий, але потужний повноекранни
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%{?with_nntp:%patch14 -p1}
-%{?with_home_etc:%patch15 -p1}
-%patch16 -p1
-%patch17 -p1
+%patch14 -p1
+%patch15 -p1
+
+%{?with_home_etc:%patch101 -p1}
+%{?with_nntp:%patch102 -p1}
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch18 -p1}
-%{?with_imap_recent:%patch19 -p1}
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
+%{?with_folder_column:%patch103 -p1}
+%{?with_imap_recent:%patch1043 -p1}
 
 # force regeneration (manual.sgml is modified by some patches)
-rm -f doc/{manual*.html,manual.txt}
+%{__rm} doc/{manual*.html,manual.txt}
 
 %build
 %{__aclocal} -I m4
@@ -187,17 +197,19 @@ rm -f doc/{manual*.html,manual.txt}
 	%{?with_nntp:--enable-nntp} \
 	--enable-pop \
 	--enable-smtp \
-	--with-bdb=/usr \
-	--without-gdbm \
+	%{?with_bdb:--with-bdb=/usr} \
 	%{!?with_slang:--with-curses} \
 	--with-docdir=%{_docdir}/%{name} \
+	%{?with_gdbm:--with-gdbm} \
 	%{?with_home_etc:--with-home-etc} \
 	--with-mailpath=/var/mail \
 	--with-mixmaster \
+	%{?with_qdbm:--with-qdbm} \
 	--with-regex \
 	%{?with_sasl:--with-sasl} \
 	%{?with_slang:--with-slang} \
-	--with-ssl
+	--with-ssl \
+	%{?with_tokyocabinet:--with-tokyocabinet}
 
 %{__make} -j1 -C doc
 %{__make}
@@ -211,7 +223,7 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	DOTLOCK_GROUP=
 
-%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16}
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH50}
 
 install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
 install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
@@ -223,31 +235,38 @@ 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
+for rc in %{_sysconfdir}/Muttrc.d/*.rc; do
 	[ ! -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]*
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
 
 # conflict with qmail
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
-
-rm -f $RPM_BUILD_ROOT/etc/mime.types
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
+# belongs to mailcap
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL
 %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
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/Muttrc
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/Muttrc.d/*.rc
 %attr(755,root,root) %{_bindir}/mutt
+%attr(755,root,root) %{_bindir}/mutt_pgpring
 %attr(755,root,root) %{_bindir}/mutt_source-muttrc.d
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
@@ -256,7 +275,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
 %{_docdir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/mutt.desktop
 %{_pixmapsdir}/mutt.png
-%{_mandir}/man*/*
-%lang(pl) %{_mandir}/pl/man*/*
+#%{_mandir}/man1/flea.1*
+%{_mandir}/man1/mutt*.1*
+%{_mandir}/man1/pgp*.1*
+%{_mandir}/man1/smime_keys.1*
+%{_mandir}/man5/mmdf.5*
+%{_mandir}/man5/muttrc.5*
+%lang(pl) %{_mandir}/pl/man1/*
+%{_infodir}/mutt.info*