From 26267a61424bc867ee7300d6c9604550556edcf7 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Feb 2024 09:56:32 +0000 Subject: [PATCH 1/3] Move Muttrc from /etc/ to /usr/share/mutt OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=269 --- mutt.changes | 7 +++++++ mutt.spec | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mutt.changes b/mutt.changes index c905208..8ef95eb 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 20 09:53:45 UTC 2024 - Dr. Werner Fink + +- Only suggest smtp daemon at runtime. Nevertheless if not + installed user will face a a warning. +- Move /etc/Muttrc to /usr/share/mutt/Muttrc + ------------------------------------------------------------------- Mon Oct 9 07:41:57 UTC 2023 - Dr. Werner Fink diff --git a/mutt.spec b/mutt.spec index f7ca2a5..66d7add 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -82,7 +82,7 @@ BuildRequires: python3-setuptools BuildRequires: smtp_daemon %endif Requires: glibc-locale -Requires: smtp_daemon +Suggests: smtp_daemon Requires(post): %{_bindir}/cat Requires(post): %{_bindir}/mkdir Requires(postun):%{_bindir}/rm @@ -287,7 +287,7 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%{name}/mailcap rm -vf %{buildroot}%{_docdir}/%{name}/manual.txt install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%{name}/ -sed -rn '/Command formats for gpg/,$p' %{SOURCE5} >> %{buildroot}%{_sysconfdir}/Muttrc +sed -rn '/Command formats for gpg/,$p' %{SOURCE5} >> %{buildroot}%{_datadir}/%{name}/Muttrc %if 0%{?suse_version} %suse_update_desktop_file mutt @@ -335,7 +335,6 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-notify %files %config(noreplace) %{_sysconfdir}/skel/.muttrc -%config(noreplace) %{_sysconfdir}/Muttrc %{_bindir}/mutt %{_bindir}/pgpewrap %{_bindir}/mutt_pgpring @@ -353,6 +352,7 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-notify %{_datadir}/mutt/mailcap %dir %doc %{_docdir}/%{name}/ %doc %{_docdir}/%{name}/manual.txt.gz +%{_datadir}/%{name}/Muttrc %if 0%{suse_version} >= 1500 %{_docdir}/%{name}/mutt_oauth2.py %{_docdir}/%{name}/mutt_oauth2.py.README From 2af06481aaf87c4c0ee266941a687a2b88f3e4a2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 20 Feb 2024 10:01:11 +0000 Subject: [PATCH 2/3] . OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=270 --- mutt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mutt.spec b/mutt.spec index 66d7add..42c5b23 100644 --- a/mutt.spec +++ b/mutt.spec @@ -287,6 +287,7 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%{name}/mailcap rm -vf %{buildroot}%{_docdir}/%{name}/manual.txt install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%{name}/ +mv %{buildroot}%{_sysconfdir}/Muttrc %{buildroot}%{_datadir}/%{name}/Muttrc sed -rn '/Command formats for gpg/,$p' %{SOURCE5} >> %{buildroot}%{_datadir}/%{name}/Muttrc %if 0%{?suse_version} From 4e127a6edb2995e876af13e0ca9629f89969894b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 23 Feb 2024 09:34:00 +0000 Subject: [PATCH 3/3] Accepting request 1149751 from home:pgajdos:m - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1149751 OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=271 --- mutt.changes | 5 +++++ mutt.spec | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/mutt.changes b/mutt.changes index 8ef95eb..50aa242 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 23 09:10:55 UTC 2024 - pgajdos@suse.com + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Tue Feb 20 09:53:45 UTC 2024 - Dr. Werner Fink diff --git a/mutt.spec b/mutt.spec index 42c5b23..93f8410 100644 --- a/mutt.spec +++ b/mutt.spec @@ -159,19 +159,19 @@ Provides translations to the package mutt. %prep %setup -q -n mutt-%{version} -%patch0 -b .p0 -%patch2 -b .pgpewrap -%patch3 -b .sendgroupreplyto -%patch4 -b .wrapcolumn -%patch7 -b .opennfs -%patch11 -b .listreply -%patch12 -b .pgp_verbose_mtime -%patch15 -b .widechar.sidebar -%patch16 -b .crlf -%patch18 -b .mailcap -%patch19 -b .cvw2014.9116 -%patch20 -b .imap -%patch21 -b .quit +%patch -P 0 -b .p0 +%patch -P 2 -b .pgpewrap +%patch -P 3 -b .sendgroupreplyto +%patch -P 4 -b .wrapcolumn +%patch -P 7 -b .opennfs +%patch -P 11 -b .listreply +%patch -P 12 -b .pgp_verbose_mtime +%patch -P 15 -b .widechar.sidebar +%patch -P 16 -b .crlf +%patch -P 18 -b .mailcap +%patch -P 19 -b .cvw2014.9116 +%patch -P 20 -b .imap +%patch -P 21 -b .quit cp %{SOURCE2} .