X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=c97964be1da81895c5c28732afa3652b8c87a1e9;hp=01dcf868287c4f93c3f73ee996faa97eaa4491a2;hb=7371475b0ba7f67bbc582023bba941fc4bc782cc;hpb=3f2cdb342d326e900feb1f662d500cb6621d2512 diff --git a/mutt.spec b/mutt.spec index 01dcf86..c97964b 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,5 +1,6 @@ # # TODO: +# - gss/heimdal # - finish -folder_columns.patch # # Conditional build: @@ -9,7 +10,13 @@ %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 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,18 +28,18 @@ Summary(ru.UTF-8): Почтовая клиентская программа Mutt Summary(tr.UTF-8): Mutt elektronik posta programı Summary(uk.UTF-8): Поштова клієнтська програма Mutt Name: mutt -Version: 1.5.21 -Release: 5 +Version: 1.6.2 +Release: 4 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: 9f0f9cc35878987d7cdc7df6a1967376 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}.1.pl 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 @@ -48,37 +55,44 @@ Patch10: %{name}-manual.patch Patch11: %{name}-xface.patch Patch12: %{name}-Muttrc_mbox_path.patch Patch13: %{name}-po.patch +Patch14: %{name}-home_etc.patch +Patch15: %{name}-Muttrc.patch +Patch16: %{name}-muttbug-tmp.patch +Patch17: %{name}-folder_columns.patch +Patch18: %{name}-imap_recent.patch +Patch19: %{name}-Muttrc.head.patch +Patch20: %{name}-smime.rc.patch +Patch21: %{name}-sidebar.patch +Patch22: %{name}-imap_fast_trash.patch +Patch23: %{name}-db.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 -Patch23: %{name}-sidebar.patch -Patch24: %{name}-imap_fast_trash.patch +Patch24: %{name}-vvv.nntp.patch +Patch25: format-security.patch +Patch26: %{name}-keep_to.patch +Patch27: mutt-gpgme.patch +Patch28: openssl.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 -BuildRequires: gettext-devel -BuildRequires: gpgme-devel >= 1:1.1.0 +%{?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: 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} +%{?with_tokyocabinet:BuildRequires: tokyocabinet-devel} +%{?with_home_etc:Requires: home-etc-lib >= 1.0.8} Requires: iconv Suggests: mailcap -%{?with_home_etc:Conflicts: home-etc < 1.0.8} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define specflags_ia32 -fomit-frame-pointer @@ -141,7 +155,6 @@ Mutt - це невеликий, але потужний повноекранни %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -154,21 +167,25 @@ Mutt - це невеликий, але потужний повноекранни %patch11 -p1 %patch12 -p1 %patch13 -p1 -%{?with_nntp:%patch14 -p1} -%{?with_home_etc:%patch15 -p1} +%{?with_home_etc:%patch14 -p1} +%patch15 -p1 %patch16 -p1 -%patch17 -p1 # breaks display if arrow_cursor is set -%{?with_folder_column:%patch18 -p1} -%{?with_imap_recent:%patch19 -p1} +%{?with_folder_column:%patch17 -p1} +%{?with_imap_recent:%patch18 -p1} +%patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 -%patch24 -p1 +%{?with_nntp:%patch24 -p1} +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -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 @@ -189,17 +206,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} @@ -213,7 +232,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} < %{PATCH15} install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d @@ -231,12 +250,12 @@ 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%{_sysconfdir}/mime.types +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5* +# belongs to mailcap +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types %find_lang %{name} @@ -258,7 +277,12 @@ 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/*