From 62bfd1d5767557fc71683d160cf15f23b153a8cb Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Oct 02 2017 09:42:14 +0000
Subject: Update to 0.6; Cleanup spec


Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

---

diff --git a/.gitignore b/.gitignore
index d5f7a9b..e56cea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /alot-9abcc757db854cfe3024dc81d89dac66b960eade.tar.gz
 /alot-a7075ea6226f2dfed0142529f73989961ee7b65d.tar.gz
+/alot-0.6.tar.gz
+/alot-0.6.tar.gz.asc
diff --git a/0001-don-t-depend-on-weird-python-magic-distribution.patch b/0001-don-t-depend-on-weird-python-magic-distribution.patch
index c028085..1b66e2f 100644
--- a/0001-don-t-depend-on-weird-python-magic-distribution.patch
+++ b/0001-don-t-depend-on-weird-python-magic-distribution.patch
@@ -1,4 +1,4 @@
-From 7021a671ba5e8f4ea6e4c938861084d8bd91bd36 Mon Sep 17 00:00:00 2001
+From 2f1d3760ffd3f60ba9d5563bb7985b39c229ab58 Mon Sep 17 00:00:00 2001
 From: Tomas Tomecek <ttomecek@redhat.com>
 Date: Thu, 12 Jan 2017 16:04:48 +0100
 Subject: [PATCH] don't depend on weird python-magic distribution
@@ -11,17 +11,14 @@ Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 226b8dd..8db2803 100755
+index f20c5cb..75967b7 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -30,7 +30,6 @@ setup(name='alot',
+@@ -45,7 +45,6 @@ setup(
          'urwid>=1.1.0',
          'urwidtrees>=1.0',
          'twisted>=10.2.0',
 -        'python-magic',
          'configobj>=4.7.0',
-         'pygpgme>=0.2'],
-       provides=['alot'],
--- 
-2.11.0
-
+         'gpg'
+     ],
diff --git a/alot.spec b/alot.spec
index c2a038b..987a564 100644
--- a/alot.spec
+++ b/alot.spec
@@ -1,64 +1,59 @@
-%global owner pazz
-%global commit a7075ea6226f2dfed0142529f73989961ee7b65d
-
-Name:       alot
-Version:    0.4
-Release:    3%{?dist}
-Summary:    An experimental terminal MUA based on notmuch mail
-
-Group:      Applications/Internet
-License:    GPLv3
-URL:        https://github.com/%{owner}/%{name}
-Source0:    https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
-Patch0:     ./0001-don-t-depend-on-weird-python-magic-distribution.patch
+Name:           alot
+Version:        0.6
+Release:        1%{?dist}
+Summary:        Experimental terminal MUA based on notmuch mail
+
+License:        GPLv3+
+URL:            https://github.com/pazz/alot
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source1:        %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
+Source2:        gpgkey-B7838D65FEE80DED1DCA494D94340367D7D6C5AA.gpg
+Patch0:         0001-don-t-depend-on-weird-python-magic-distribution.patch
 
 BuildArch:      noarch
+
+BuildRequires:  gnupg2
 BuildRequires:  python2-devel
-BuildRequires:  python-sphinx
-Requires:       python-notmuch
-Requires:       python-urwid
-Requires:       python-urwidtrees
-Requires:       python-twisted
-Requires:       python2-pygpgme
-Requires:       python-configobj
-Requires:       python-magic
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-sphinx
+Requires:       python2-notmuch >= 0.13
+Requires:       python-urwid >= 1.1.0
+Requires:       python2-urwidtrees >= 1.0
+Requires:       python2-twisted >= 10.2.0
+Requires:       python2-magic
+Requires:       python2-configobj >= 4.7.0
+Requires:       python2-gpg
 
 %description
 alot makes use of existing solutions where possible: It does not fetch, send or
 edit mails; it lets notmuch handle your mailindex and uses a toolkit to render
 its display. You are responsible for automatic initial tagging.
 
-
 %prep
-%autosetup -n %{name}-%{commit}
-
+gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%autosetup -p1
 
 %build
 %py2_build
-pushd docs
-make %{?_smp_mflags} man
-popd
-
+%make_build man SPHINX_BUILD=sphinx-build-2 PYTHON=python2 -C docs
 
 %install
 %py2_install
-pushd docs
-mkdir -p %{buildroot}%{_mandir}/man1/
-install -p -m 0644 build/man/alot.1* %{buildroot}%{_mandir}/man1/
-popd
-
+install -Dpm0644 docs/build/man/alot.1* -t %{buildroot}%{_mandir}/man1/
 
 %files
-%{python2_sitelib}/alot/*
-%{python2_sitelib}/alot-%{version}-*.egg-info
-%doc NEWS
-%doc COPYING
-%doc README.md
+%license COPYING
+%doc NEWS README.md
+%{python2_sitelib}/alot/
+%{python2_sitelib}/alot-*.egg-info/
 %{_bindir}/alot
-%{_mandir}/man1/alot*
-
+%{_mandir}/man1/alot.1*
 
 %changelog
+* Mon Oct 02 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6-1
+- Update to 0.6
+- Cleanup spec
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/gpgkey-B7838D65FEE80DED1DCA494D94340367D7D6C5AA.gpg b/gpgkey-B7838D65FEE80DED1DCA494D94340367D7D6C5AA.gpg
new file mode 100644
index 0000000..69c42f6
Binary files /dev/null and b/gpgkey-B7838D65FEE80DED1DCA494D94340367D7D6C5AA.gpg differ
diff --git a/sources b/sources
index 97867ce..c199ca0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (alot-a7075ea6226f2dfed0142529f73989961ee7b65d.tar.gz) = 92955dcab33f156962625fe6c1e875fbfc43a7337f6f51f7304caf5afba75cdaa23d89aacd1547f7474053a0bdc3e26d20116da3a18b03b22d3efad42e329d07
+SHA512 (alot-0.6.tar.gz) = b21f0e9ee6d4dbf21c3f2b305779641d486545fe0a81c2dd532edf43866b1c3702c0787611133e3ae211d1c3af3bbc2e30f0d0a260b420aa6d447a161e98859b
+SHA512 (alot-0.6.tar.gz.asc) = 3b89696334997413e87498103c1add4332ffc704d949702790c5a4f0671516da54f625f212509ad9f74c76ad8be4b587bcf82c41f460c11ed2168f11f0c08534