Author: radek Date: Mon Mar 26 13:10:44 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - merged 1.5.14 from DEVEL
---- Files affected: SPECS: mutt.spec (1.193 -> 1.194) ---- Diffs: ================================================================ Index: SPECS/mutt.spec diff -u SPECS/mutt.spec:1.193 SPECS/mutt.spec:1.194 --- SPECS/mutt.spec:1.193 Mon Feb 19 23:40:04 2007 +++ SPECS/mutt.spec Mon Mar 26 15:10:38 2007 @@ -9,72 +9,70 @@ %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.4.2.2 +Version: 1.5.14 Release: 1 Epoch: 6 License: GPL Group: Applications/Mail -Source0: ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz -# Source0-md5: 51a08429c5bd5c34af3f4268b8cbcda3 +Source0: ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz +# Source0-md5: 6d33b4f0074e39772021d947c49b30c6 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}.1.pl -Patch0: %{name}-paths.patch +#Patch0: %{name}-pl.po-update.patch Patch1: %{name}-forcedotlock.patch -Patch2: %{name}-muttbug-tmp.patch -Patch3: %{name}-rr.compressed.patch -Patch4: %{name}-cd.edit_threads.patch -Patch5: %{name}-bj.status-time.patch -Patch6: %{name}-devl.narrow_tree.patch -Patch7: %{name}-vvv.quote.gz -Patch8: %{name}-null_name.patch -Patch9: %{name}-cd.trash_folder.patch -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}-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}-sasl-fixes.patch -Patch26: %{name}-long-lines.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 +#PatchXXX: %{name}-pgp_hook.patch URL: http://www.mutt.org/ -%{!?with_slang:BuildRequires: ncurses-devel >= 5.4-0.7} BuildRequires: autoconf BuildRequires: automake %{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.1.0} -BuildRequires: gettext-devel -BuildRequires: groff +BuildRequires: db-devel %{?with_home_etc:BuildRequires: home-etc-devel >= 1.0.8} -%{?with_esmtp:BuildRequires: libesmtp-devel} +BuildRequires: gettext-devel +BuildRequires: gpgme-devel >= 1:1.0.0 +BuildRequires: libidn-devel +BuildRequires: lynx +%{!?with_slang:BuildRequires: ncurses-devel >= 5.0} 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} +%{?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} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define specflags_ia32 -fomit-frame-pointer +%define specflags_ia32 -fomit-frame-pointer %description Mutt is a small but very poweful full-screen Unix mail client. @@ -134,8 +132,8 @@ експериментальну) підтримку NNTP. %prep -%setup -q -n %{name}-%(echo %{version} | sed 's/i$//') -%patch0 -p1 +%setup -q +#%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -144,26 +142,18 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 # breaks display if arrow_cursor is set -%{?with_folder_column:%patch12 -p1} +%{?with_folder_column:%patch9 -p1} # disabled - changes default behaviour -##%patch13 -p0 +#%patch10 -p0 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -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 -%patch26 -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} @@ -174,32 +164,28 @@ %{__autoheader} %{__automake} %configure \ - --%{?debug:en}%{!?debug:dis}able-debug \ - %{!?with_slang:--with-curses} \ - %{?with_slang:--with-slang} \ + %{!?debug:--disable-debug} %{?debug:--enable-debug} \ + --disable-warnings \ --enable-compressed \ --enable-external-dotlock \ + --enable-gpgme \ --enable-imap \ - --without-included-gettext \ --enable-mailtool \ - --with-mixmaster \ - --enable-pop \ %{?with_nntp:--enable-nntp} \ - --with-regex \ - --with%{!?with_sasl:out}-sasl \ - --with%{!?with_home_etc:out}-home-etc \ - %{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \ - --with-ssl \ - --disable-warnings \ + --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-sharedir=%{_datadir} \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ - --sysconfdir=%{_sysconfdir} + --with-regex \ + --with-mixmaster \ + %{?with_sasl:--with-sasl2} \ + --with-ssl \ + --without-included-gettext %{__make} %{__make} manual.txt -C doc @@ -211,7 +197,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16} +%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12} install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} @@ -224,7 +210,7 @@ # conflict with qmail rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5* -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types +rm -f $RPM_BUILD_ROOT/etc/mime.types %find_lang %{name} @@ -234,11 +220,12 @@ %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} -%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/Muttrc +%config(noreplace,missingok) %verify(not md5 size mtime) %{_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(755,root,root) %{_bindir}/smime_keys %attr(2755,root,mail) %{_bindir}/mutt_dotlock %{_docdir}/%{name} @@ -253,176 +240,99 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.193 2007/02/19 22:40:04 qrczak -- mutt-long-lines.patch: fixed cutting of lines after 256 characters - during quoted-printable decoding. Untested. +Revision 1.194 2007/03/26 13:10:38 radek +- merged 1.5.14 from DEVEL -Revision 1.192 2007/02/13 07:16:49 glen -- tabs in preamble +Revision 1.141.2.25 2007/03/26 12:59:17 radek +- version 1.5.14, updated -{rr-compressed,xface}.patch, dropped -pl.po-update.patch (doesn't seem needed) -Revision 1.191 2007/02/12 00:49:09 baggins +Revision 1.141.2.24 2007/02/12 13:20:14 baggins - converted to UTF-8 -Revision 1.190 2006/08/21 18:40:28 qboosh -- added sasl-fixes patch (backport from 1.5.x, spotted by Mariusz Krynski) - -Revision 1.189 2006/08/21 18:06:28 qboosh -- removed obsolete missing_includes patch - -Revision 1.188 2006/07/17 13:45:41 havner -- 1.4.2.2 (CVE-2006-3242) - -Revision 1.187 2006/05/19 10:11:53 qboosh -- reverted accidental DEVEL merge - -Revision 1.185 2005/12/29 13:59:45 adamg -- -missing_includes.patch added (builds with gcc4 now) - -Revision 1.184 2005/12/04 23:10:18 glen -- adapterized (sorted %verify flags) - -Revision 1.183 2005/08/22 13:12:02 saq -- rel 10 for fixed paths.patch - -Revision 1.182 2005/08/21 22:14:31 adamg -- a year has passed, time for an integer release :) -- release 9 - -Revision 1.181 2005/08/21 19:38:55 saq -- bump ncurses BR for ncursesw -- paths.patch for deterministic build with{,out} external progs - -Revision 1.180 2005/08/21 17:30:37 saq -- concise bcond usage - -Revision 1.179 2005/05/09 12:47:56 qboosh -- whitespace cleanup - -Revision 1.178 2004/09/07 12:44:51 adamg -- BuildRequires: groff - -Revision 1.177 2004/08/21 21:37:58 adamg -- do not apply mutt-folder_column.patch by default. It looks like this patch - breaks display if arrow_cursor is set (pointed out by Jan Kanty Palus) -- release 8.1 - -Revision 1.176 2004/08/04 06:22:40 ankry -- i18n fixes (-po patch), rel. 8 - -Revision 1.175 2004/07/29 19:15:10 kali -- desktop fix, rel. 7 - -Revision 1.174 2004/06/20 21:36:56 arekm -- fix specflags (quotation here is buggy) - -Revision 1.173 2004/03/19 23:46:31 ankry -- massive change: BR openssl-devel >= 0.9.7d - -Revision 1.172 2004/03/11 13:45:21 qboosh -- release 6 to correctly build manual.txt with fixed sgml-tools (BTS#838) - -Revision 1.171 2004/03/04 17:25:04 siefca -- added patch for the default config file (sets mailbox location to ~/Mail/mbox) -- release 6 - -Revision 1.170 2004/02/16 14:51:55 qboosh -- try with non-versioned docdir (containing compressed manual) - -Revision 1.169 2004/02/16 13:52:57 qboosh -- hopefully fixed broken rr.compressed and php_hook patches, updated manual patch -- call autoheader, added comment for disabled patch13 - -Revision 1.168 2004/02/15 16:49:22 adamg -- readded removed patch15 -- reverted --with-docdir path - -Revision 1.167 2004/02/15 11:28:38 blues -- release 4 - -Revision 1.166 2004/02/15 00:44:36 adamg -- manual.txt should be placed in %%{_datadir}/%{name}, not in %%doc -- release 2 - -Revision 1.165 2004/02/14 17:08:48 misi3k -- rel 1 +Revision 1.141.2.23 2006/08/23 20:37:04 qboosh +- updated to 1.5.13, updated pl.po-update,rr.compressed,manual patches -Revision 1.164 2004/02/14 10:42:44 misi3k -- rel 0.2, NFY +Revision 1.141.2.22 2006/08/17 09:42:38 radek +- BR: docbook-style-xsl libxslt-progs (for manual.txt) -Revision 1.163 2004/02/14 10:07:15 misi3k -- sec update (1.4.2.1), NFY -CVE: CAN-2004-0078 -Bug: -It was discovered that certain messages would cause mutt to crash. +Revision 1.141.2.21 2006/08/04 14:17:12 wrobell +- rel. 1 -Revision 1.162 2004/02/05 08:23:51 jajcus -- kill some compiler warnings (-kill_warnings.patch) +Revision 1.141.2.20 2006/08/04 13:57:11 wrobell +- ver. 1.5.12 + resolves CVE-2006-3242 +- nfy -Revision 1.161 2003/12/15 13:49:37 siefca -- prepared to link against stable version of libhome_etc +Revision 1.141.2.19 2006/05/24 13:08:09 jajcus +- BR: db-devel -Revision 1.160 2003/12/12 18:36:56 ankry -- cosmetics +Revision 1.141.2.18 2006/05/11 23:17:58 siefca +- home_etc patch fixed -Revision 1.159 2003/12/11 16:53:44 eothane -- bconds +Revision 1.186 2006/05/11 23:13:05 siefca +- home_etc patch fixed -Revision 1.158 2003/12/11 16:14:43 siefca -- Requires: home-etc version >= 1.0.7 +Revision 1.141.2.17 2006/04/17 16:33:30 wrobell +- ver. 1.5.11 (there is no international version now) -Revision 1.157 2003/12/11 13:33:26 siefca -- Requires: home-etc >= 1.0.6 +Revision 1.141.2.16 2005/10/07 11:13:59 wolf +- fixed -Revision 1.156 2003/12/08 13:14:28 siefca -- patch fixed (now it uses libhome_etc in an elegant way) -- release 6 +Revision 1.141.2.15 2005/10/07 08:04:24 jajcus +- Version: 1.5.10 +- edit_threads patch removed, as already applied to original sources +- header caching enabled in ./configure (runtime configuration needed to enable + this) -Revision 1.155 2003/12/07 18:25:27 siefca -- added home-etc patch, which uses home-etc library +Revision 1.141.2.14 2005/03/31 19:28:19 qboosh +- updated esmtp optional patch +- enabled idn and gpgme, sorted configure options -Revision 1.154 2003/12/04 22:29:10 grzegol -- moved .desktop file to _desktopdir -- rel. 5 +Revision 1.141.2.13 2005/03/31 18:10:29 qboosh +- updated optional nntp patch -Revision 1.153 2003/10/10 05:55:02 witekfl -- added home_etc2.patch with support for $HOME_ETC -- Release 4 +Revision 1.141.2.12 2005/03/31 17:17:52 qboosh +- more patch updates; builds at last -Revision 1.152 2003/09/30 20:18:27 eothane -- ahh, what the hell: openssl 0.9.7c +Revision 1.141.2.11 2005/03/31 16:30:50 qboosh +- more patches updated; pgp-hook patch is outdated +- merged Muttrc_mbox_path,po patches from HEAD; kill_warnings is obsolete -Revision 1.151 2003/08/21 23:44:08 maryush -- grrr remove mutt-esmtp.rc source... it is not needed +Revision 1.141.2.10 2005/03/31 14:17:50 qboosh +- devl.narrow_tree functionality already in sources +- updated vvv.quote patch -Revision 1.150 2003/08/21 13:58:26 maryush -- added libesmtp support (not enabled by default) -- release 3 +Revision 1.141.2.9 2005/03/31 14:03:30 qboosh +- updated cd.edit_threads patch -Revision 1.149 2003/06/28 19:36:25 gotar -- -fomit-frame-pointer on ia32 +Revision 1.141.2.8 2005/03/31 13:36:56 qboosh +- started 1.5.9 +- added pl.po-update patch, updated rr.compressed patch +- removed obsolete muttbug-tmp patch -Revision 1.148 2003/05/25 11:00:55 malekith -- massive attack, adding Source-md5 +Revision 1.141.2.7 2005/03/31 12:22:03 qboosh +- sync with HEAD (vfolders, some new patches - commented for now) -Revision 1.147 2003/05/25 05:50:55 misi3k -- massive attack s/pld.org.pl/pld-linux.org/ +Revision 1.141.2.6 2004/04/28 06:50:13 jareq +- 1.5.6 (build without sasl) +- epoch 6 (same as HEAD) +- BR openssl-devel >= 0.9.7d -Revision 1.146 2003/04/25 12:22:45 gotar -- added _without_sasl trailing comment +Revision 1.141.2.5 2003/11/17 17:12:32 jareq +- smtpdaemon is recommended not required by mutt -Revision 1.145 2003/04/16 10:19:50 radek -- BR: sgml-tools-dtd (IIRC for resolving entities in manual) +Revision 1.141.2.4 2003/11/10 21:57:29 areq +- 1.5.5.1, (build without sasl) -Revision 1.144 2003/03/31 14:19:57 tjbynum -- mutt could work without smtpdaemon, eg. as pop3 client. +Revision 1.141.2.3 2003/07/11 01:34:20 eothane +- some pld.org.pl->pld-linux.org cosmetics -Revision 1.143 2003/03/23 15:10:25 qboosh -- updated nntp patch -- removed junk from pgp_hook patch, patch is back -- release 2 - previous functionality restored +Revision 1.141.2.2 2003/03/20 18:16:19 areq +- start DEVEL branch - 1.5.x +- builds --without sasl and works -Revision 1.142 2003/03/21 19:18:59 kloczek -- merge ko translations from MIZI. +Revision 1.141.2.1 2003/03/20 18:13:55 areq +- DEVEL Revision 1.141 2003/03/20 09:04:38 misi3k - updated to 1.4.1 (fix a buffer overflow in mutt's IMAP client code) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.193&r2=1.194&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
