Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2012-05-31 17:07:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutt", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mutt/mutt.changes 2011-12-02 16:25:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2012-05-31 17:07:28.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 29 14:10:05 UTC 2012 - [email protected] + +- fix build with automake-1.12 + - add: automake-1.12.patch + +------------------------------------------------------------------- +Fri Apr 13 12:58:09 UTC 2012 - [email protected] + +- Added patch automatically add a filename and description to PGP/MIME attachments. + +------------------------------------------------------------------- @@ -372 +383 @@ - of Mr. Carsten H�ger + of Mr. Carsten Höger @@ -435 +446 @@ -- Include patch from Jo�l Riou <[email protected]> which +- Include patch from Joël Riou <[email protected]> which New: ---- automake-1.12.patch patch-1.5.21.vk.pgp_verbose_mime ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.qVMuBY/_old 2012-05-31 17:07:30.000000000 +0200 +++ /var/tmp/diff_new_pack.qVMuBY/_new 2012-05-31 17:07:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mutt #!BuildIgnore: sendmail +BuildRequires: autoconf +BuildRequires: automake BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-gssapi @@ -46,8 +49,6 @@ %else BuildRequires: gpgme-devel %endif -License: GPL-2.0+ -Group: Productivity/Networking/Email/Clients Url: http://www.mutt.org Provides: muttssl Obsoletes: muttssl @@ -62,6 +63,8 @@ Version: 1.5.21 Release: 0 Summary: Mail Program +License: GPL-2.0+ +Group: Productivity/Networking/Email/Clients # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 Source1: Signature_conversion @@ -89,6 +92,8 @@ Patch12: mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html Patch13: aw.listreply.diff +Patch14: patch-1.5.21.vk.pgp_verbose_mime +Patch15: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -118,6 +123,8 @@ %patch11 -p1 -b .sidebar.color %patch12 -p0 -b .tinfo %patch13 -p1 -b .listreply +%patch14 -p1 +%patch15 -p1 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -135,8 +142,8 @@ --prefix=%{_prefix} \ --datadir=%{_datadir} \ --sysconfdir=%{_sysconfdir} \ - --mandir=%_mandir \ - --with-docdir=%_defaultdocdir/%name \ + --mandir=%{_mandir} \ + --with-docdir=%{_docdir}/%name \ --enable-imap \ --enable-pop \ --enable-pgp \ @@ -159,34 +166,38 @@ make -C doc %install -make install DESTDIR=$RPM_BUILD_ROOT -mv Muttrc.SuSE $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc -install -m 755 %{S:1} $RPM_BUILD_ROOT%{_bindir} +make install DESTDIR=%{buildroot} +mv Muttrc.SuSE %{buildroot}%{_sysconfdir}/Muttrc +install -m 755 %{S:1} %{buildroot}%{_bindir} gzip -9 doc/manu*.txt rm -f contrib/Makefile* # datadir not automatically created: -mkdir -p $RPM_BUILD_ROOT%{_datadir}/mutt +mkdir -p %{buildroot}%{_datadir}/mutt +# INSTALL file should be removed: +rm -rf %{buildroot}%{_docdir}/%{name}/INSTALL # mbox/mmdf manual page conflicts with the one from tin, so rename it -mv $RPM_BUILD_ROOT%_mandir/man5/mbox.5 \ - $RPM_BUILD_ROOT%_mandir/man5/mbox_mutt.5 -mv $RPM_BUILD_ROOT%_mandir/man5/mmdf.5 \ - $RPM_BUILD_ROOT%_mandir/man5/mmdf_mutt.5 +mv %{buildroot}%{_mandir}/man5/mbox.5 \ + %{buildroot}%{_mandir}/man5/mbox_mutt.5 +mv %{buildroot}%{_mandir}/man5/mmdf.5 \ + %{buildroot}%{_mandir}/man5/mmdf_mutt.5 %find_lang %name # We get mime.types from aaa_base -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types +rm -f %{buildroot}%{_sysconfdir}/mime.types # Mutt BTS is gone -rm -f $RPM_BUILD_ROOT/%_mandir/man1/{flea*,muttbug*} -rm -f $RPM_BUILD_ROOT%{_bindir}/{flea,muttbug} -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.dist -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types.dist -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/applications/ -install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.muttrc +rm -f %{buildroot}%{_mandir}/man1/{flea*,muttbug*} +rm -f %{buildroot}%{_bindir}/{flea,muttbug} +rm -f %{buildroot}%{_sysconfdir}/Muttrc.dist +rm -f %{buildroot}%{_sysconfdir}/mime.types.dist +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/ +mkdir -p %{buildroot}%{_datadir}/applications +install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/ +install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc %suse_update_desktop_file mutt -%if 0%{?suse_version} > 1130 +#%fdupes %{buildroot} + +%if 0%{?suse_version} >= 1140 %post %mime_database_post @@ -195,12 +206,9 @@ %mime_database_postun %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %name.lang %defattr(-,root,root) -%doc doc/manual*.html doc/manual.txt.gz COPYRIGHT INSTALL README* NEWS TODO +%doc doc/manual*.html doc/manual.txt.gz COPYRIGHT README* NEWS TODO %doc doc/PGP-Notes.txt doc/applying-patches.txt doc/devel-notes.txt %doc contrib/ %config(noreplace) %{_sysconfdir}/skel/.muttrc @@ -211,11 +219,11 @@ %{_bindir}/Signature_conversion %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/mutt.png -%_mandir/man1/mutt.1.gz -%_mandir/man1/smime_keys.1.gz -%_mandir/man5/mmdf_mutt.5.gz -%_mandir/man5/muttrc.5.gz -%_mandir/man5/mbox_mutt.5.gz +%{_mandir}/man1/mutt.1.gz +%{_mandir}/man1/smime_keys.1.gz +%{_mandir}/man5/mmdf_mutt.5.gz +%{_mandir}/man5/muttrc.5.gz +%{_mandir}/man5/mbox_mutt.5.gz %{_datadir}/mutt %config(noreplace) %{_sysconfdir}/Muttrc ++++++ automake-1.12.patch ++++++ Index: mutt-1.5.21/configure.ac =================================================================== --- mutt-1.5.21.orig/configure.ac +++ mutt-1.5.21/configure.ac @@ -27,7 +27,6 @@ AC_MSG_RESULT($mutt_cv_prefix) AC_PROG_CC AC_ISC_POSIX -AM_C_PROTOTYPES if test "x$U" != "x"; then AC_MSG_ERROR(Compiler not ANSI compliant) fi ++++++ patch-1.5.21.vk.pgp_verbose_mime ++++++ diff -rupN a/globals.h b/globals.h --- a/globals.h 2009-08-26 03:08:52.000000000 +0800 +++ b/globals.h 2012-04-11 12:52:44.826523028 +0800 @@ -227,6 +227,8 @@ WHERE REGEXP PgpGoodSign; WHERE char *PgpSignAs; WHERE short PgpTimeout; WHERE char *PgpEntryFormat; +WHERE char *PgpMimeSignatureFilename; +WHERE char *PgpMimeSignatureDescription; WHERE char *PgpClearSignCommand; WHERE char *PgpDecodeCommand; WHERE char *PgpVerifyCommand; diff -rupN a/init.h b/init.h --- a/init.h 2010-09-15 23:39:31.000000000 +0800 +++ b/init.h 2012-04-11 12:52:44.825523029 +0800 @@ -2556,6 +2556,18 @@ struct option_t MuttVars[] = { ** a line quoted text if it also matches $$smileys. This mostly ** happens at the beginning of a line. */ + { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"}, + /* + ** .pp + ** This option sets the filename used for signature parts in PGP/MIME + ** signed messages. + */ + { "pgp_mime_signature_description", DT_STR, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"}, + /* + ** .pp + ** This option sets the Content-Description used for signature parts in + ** PGP/MIME signed messages. + */ diff -rupN a/PATCHES b/PATCHES --- a/PATCHES 2008-03-20 04:07:06.000000000 +0800 +++ b/PATCHES 2012-04-11 12:52:44.824523030 +0800 @@ -0,0 +1 @@ +patch-1.5.3.vk.pgp_verbose_mime diff -rupN a/pgp.c b/pgp.c --- a/pgp.c 2010-09-14 01:19:55.000000000 +0800 +++ b/pgp.c 2012-04-11 12:52:44.825523029 +0800 @@ -1129,6 +1129,8 @@ BODY *pgp_sign_message (BODY *a) t->disposition = DISPNONE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); + t->description = safe_strdup (PgpMimeSignatureDescription); return (a); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
