From 43b65cd1d627bc5344b8696d9726c86a3e45b69f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 3 Feb 2011 10:37:48 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=58 --- mutt.changes | 13 ++++++++++++- mutt.spec | 20 +++++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/mutt.changes b/mutt.changes index 0e113d7..a9724f5 100644 --- a/mutt.changes +++ b/mutt.changes @@ -6,16 +6,27 @@ Thu Feb 3 02:00:55 CET 2011 - ro@suse.de ------------------------------------------------------------------- Wed Feb 2 09:47:43 CET 2011 - werner@suse.de -- Switch from ibuildrequires gpgme-devel to libgpgme-devel for 11.4 +- Switch from buildrequires gpgme-devel to libgpgme-devel for 11.4 - Work around missing buildrequires of libgpgme-devel by adding libassuan-devel for 11.4 +------------------------------------------------------------------- +Mon Jan 31 13:55:54 UTC 2011 - gber@opensuse.org + +- recommend smtp_daemon since mutt has builtin SMTP support + ------------------------------------------------------------------- Mon Jan 31 14:30:26 CET 2011 - werner@suse.de - Fix the orther sidebar patch as it is broken with MALLOC_CHECK=1 now static buffers are used instead (re)alloced arrays. +------------------------------------------------------------------- +Wed Jan 26 13:47:31 UTC 2011 - gber@opensuse.org + +- fix build by removing Makefiles from contrib +- added missing %mime_database_post/%mime_database_postun + ------------------------------------------------------------------- Wed Jan 26 12:46:10 UTC 2011 - gber@opensuse.org diff --git a/mutt.spec b/mutt.spec index 5b1f88c..6f628e4 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,18 +20,23 @@ Name: mutt #!BuildIgnore: sendmail -BuildRequires: cyrus-sasl-devel cyrus-sasl-gssapi docbook-xsl-stylesheets docbook_4 glibc-i18ndata gpgme-devel ispell krb5-devel libcom_err libgcrypt libgpg-error-devel libidn-devel libxml2 libxslt lynx ncurses-devel openssl-devel postfix sgml-skel update-desktop-files xli -BuildRequires: gdbm-devel +BuildRequires: cyrus-sasl-devel cyrus-sasl-gssapi docbook-xsl-stylesheets docbook_4 gdbm-devel glibc-i18ndata ispell krb5-devel libcom_err libgcrypt libgpg-error-devel libidn-devel libxml2 libxslt lynx ncurses-devel openssl-devel postfix sgml-skel update-desktop-files xli #if %if 0%{?suse_version} > 1130 BuildRequires: libgpgme-devel libassuan-devel +%else +BuildRequires: gpgme-devel %endif License: GPLv2+ Group: Productivity/Networking/Email/Clients Url: http://www.mutt.org Provides: muttssl Obsoletes: muttssl -Requires: smtp_daemon +Recommends: smtp_daemon +%if 0%{?suse_version} > 1130 +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +%endif # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE @@ -125,6 +130,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mv Muttrc.SuSE $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc install -m 755 %{S:1} $RPM_BUILD_ROOT%{_bindir} gzip -9 doc/manu*.txt +rm -f contrib/Makefile* # datadir not automatically created: mkdir -p $RPM_BUILD_ROOT%{_datadir}/mutt # mbox/mmdf manual page conflicts with the one from tin, so rename it @@ -147,6 +153,14 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/applications/ install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.muttrc %suse_update_desktop_file mutt +%if 0%{?suse_version} > 1130 +%post +%mime_database_post + +%postun +%mime_database_postun +%endif + %clean rm -rf $RPM_BUILD_ROOT