From fa8348df1db25f0a3b5dfb534c81112eea3be447 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Jan 10 2016 17:58:14 +0000
Subject: Update to 2.0.1


---

diff --git a/.gitignore b/.gitignore
index f6e6aa7..f2b2302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gnome-gmail-1.5.1.tgz
 /gnome-gmail-86117f754370d9a702ab5ae1b1fd425e93a3dc7d.tar.gz
 /gnome-gmail-2d392edc9f257f0410eafb57b0d2ae73edaa62e7.tar.gz
 /gnome-gmail-8abc7ffd42573fc7bddb6c23b0d9a3288af8e7b6.tar.gz
+/2.0.1.tar.gz
diff --git a/gnome-gmail.spec b/gnome-gmail.spec
index eaf1949..a13a989 100644
--- a/gnome-gmail.spec
+++ b/gnome-gmail.spec
@@ -1,32 +1,26 @@
 %if 0%{?fedora} > 22
-# Temporarily always without until Python 3 support is re-merged:
-# https://apps.fedoraproject.org/packages/gnome-gmail/bugs/all
-#bcond_without python3
-%bcond_with python3
+%bcond_without python3
 %else
 %bcond_with python3
 %endif
 %{!?python3_pkgversion: %global python3_pkgversion 3}
 
-# Github infos
-%global commit 8abc7ffd42573fc7bddb6c23b0d9a3288af8e7b6
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:           gnome-gmail
-Version:        1.9.5
-Release:        1%{?dist}
+Version:        2.0.1
+Release:        0%{?dist}
 Summary:        Integrate GMail into the GNOME desktop
 
 Group:          Applications/Internet
 License:        GPLv2
 URL:            https://davesteele.github.io/gnome-gmail/
-Source0:        https://github.com/davesteele/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+Source0:        https://github.com/davesteele/%{name}/archive/master/%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
+BuildRequires:  %{_bindir}/appstream-util
 %if %{with python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 Requires:       python%{python3_pkgversion}-six
@@ -50,7 +44,7 @@ mail handler. It opens in the default web browser.
 
 
 %prep
-%setup -qn %{name}-%{commit}
+%setup -qn %{name}-master-%{version}
 
 
 %build
@@ -64,7 +58,7 @@ mail handler. It opens in the default web browser.
 %install
 %if %{with python3}
 %py3_install
-sed -i -e 's|/usr/bin/python[^ ]\{1,\}|%{__python3}|' \
+sed -i -e 's|/usr/bin/python[^ ]*|%{__python3}|' \
     %{buildroot}%{_datadir}/%{name}/gnomegmail.py
 cat <<\EOF > %{buildroot}%{_bindir}/%{name}
 #!/bin/sh
@@ -72,7 +66,7 @@ exec %{_datadir}/%{name}/gnomegmail.py "$@"
 EOF
 %else
 %py2_install
-sed -i -e 's|/usr/bin/python[^ ]\{1,\}|%{__python2}|' \
+sed -i -e 's|/usr/bin/python[^ ]*|%{__python2}|' \
     %{buildroot}%{_datadir}/%{name}/gnomegmail.py
 cat <<\EOF > %{buildroot}%{_bindir}/%{name}
 #!/bin/sh
@@ -88,6 +82,11 @@ install -m 644 %{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1
 rm -rf %{buildroot}/%{_docdir}/%{name}
 
 
+%check
+appstream-util validate-relax --nonet \
+    %{buildroot}%{_datadir}/appdata/*.appdata.xml
+
+
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
@@ -116,6 +115,7 @@ fi
 %{python2_sitelib}/*egg-info
 %endif
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/%{name}
 %{_datadir}/gnome/autostart/%{name}-startup.desktop
@@ -123,6 +123,9 @@ fi
 
 
 %changelog
+* Sun Jan 10 2016 Ville Skyttä <ville.skytta@iki.fi> - 2.0.1-1
+- Update to 2.0.1
+
 * Fri Dec  4 2015 Ville Skyttä <ville.skytta@iki.fi> - 1.9.5-1
 - Upstream 1.9.5, python 3 packaging preparations
 - Fix build and runtime dependencies
diff --git a/sources b/sources
index b3bf6ad..c9d1bc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f70101e25fa8f5b45572d51cbccb30d  gnome-gmail-8abc7ffd42573fc7bddb6c23b0d9a3288af8e7b6.tar.gz
+4ed177e9ef301b7919b56397bafae3f5  2.0.1.tar.gz