From a53c414a252f139ab6e5ab1307a0d2a1dafb0e15ea0f58823a3c87956ac7fd30 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Wed, 28 Feb 2018 16:07:54 +0000
Subject: [PATCH] Accepting request 581014 from
 home:dsterba:branches:server:mail

- spec cleanup
- move manual.txt from neomutt-doc as it's bound to F1 key

OBS-URL: https://build.opensuse.org/request/show/581014
OBS-URL: https://build.opensuse.org/package/show/server:mail/neomutt?expand=0&rev=6
---
 neomutt.changes |  6 ++++++
 neomutt.spec    | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/neomutt.changes b/neomutt.changes
index 2b631fb..6914705 100644
--- a/neomutt.changes
+++ b/neomutt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 28 00:00:00 CET 2018 - dsterba@suse.cz
+
+- spec cleanup
+- move manual.txt from neomutt-doc as it's bound to F1 key
+
 -------------------------------------------------------------------
 Fri Feb 23 00:00:00 CET 2018 - dsterba@suse.cz
 
diff --git a/neomutt.spec b/neomutt.spec
index 47f6e3a..227b951 100644
--- a/neomutt.spec
+++ b/neomutt.spec
@@ -20,7 +20,7 @@ Name:           neomutt
 Version:        20180223
 Release:        0
 Summary:        A command line mail reader based on Mutt
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Email/Clients
 Url:            https://www.neomutt.org
 Source:         https://github.com/neomutt/neomutt/archive/%{name}-%{version}.tar.gz
@@ -72,7 +72,7 @@ and requirements.
 %setup -q -n neomutt-%{name}-%{version}
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
 ./configure	--prefix=%{_prefix}			\
 		--docdir=%{_docdir}/neomutt	\
 		--with-mailpath=%{_localstatedir}/mail	\
@@ -109,17 +109,23 @@ make %{?_smp_mflags}
 %{_mandir}/man1/smime_keys_neomutt.1%{ext_man}
 %{_mandir}/man5/mbox_neomutt.5%{ext_man}
 %{_mandir}/man5/mmdf_neomutt.5%{ext_man}
+# this file is used from the default /etc/neomuttrc and moved from neomutt-doc
+%dir %{_docdir}/neomutt
+%doc %{_docdir}/neomutt/manual.txt
 
 %files doc
 %dir %{_docdir}/neomutt
-%{_docdir}/neomutt/*
 %doc %{_docdir}/%{name}/COPYRIGHT
 %doc %{_docdir}/%{name}/README*
 %doc %{_docdir}/%{name}/ChangeLog.md
 %doc %{_docdir}/%{name}/CODE_OF_CONDUCT.md
-%doc %{_docdir}/%{name}/LICENSE.md
+%dir %{_docdir}/%{name}/
 %doc %{_docdir}/%{name}/*.html
-%doc %{_docdir}/%{name}/*.txt
+#%doc %{_docdir}/%{name}/*.txt
+%doc %{_docdir}/neomutt/INSTALL
+%doc %{_docdir}/neomutt/PGP-Notes.txt
+%doc %{_docdir}/neomutt/mime.types
+%doc %{_docdir}/neomutt/smime-notes.txt
 %dir %doc %{_docdir}/%{name}/colorschemes/
 %doc %{_docdir}/%{name}/colorschemes/*.neomuttrc
 %dir %doc %{_docdir}/%{name}/keybase/
@@ -140,6 +146,7 @@ make %{?_smp_mflags}
 %dir %doc %{_docdir}/%{name}/lua/
 %doc %{_docdir}/%{name}/lua/test_lua-api_runner.neomuttrc
 %doc %{_docdir}/%{name}/lua/test_lua-api_spec.lua
+%doc %{_docdir}/neomutt/LICENSE.md
 
 %files lang -f %{name}.lang