From ac174ed72c03c10d43bc4a9ba94816ce855a26cb Mon Sep 17 00:00:00 2001
From: Petr Šplíchal <psplicha@redhat.com>
Date: Dec 29 2018 09:19:57 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/.gitignore b/.gitignore
index 1331b26..84d42ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /did-0.6.tar.bz2
 /did-0.9.tar.bz2
 /did-0.11.tar.bz2
+/did-0.12.tar.bz2
diff --git a/did.spec b/did.spec
index 941eac4..1ad120f 100644
--- a/did.spec
+++ b/did.spec
@@ -1,6 +1,6 @@
 Name: did
-Version: 0.11
-Release: 3%{?dist}
+Version: 0.12
+Release: 1%{?dist}
 
 Summary: What did you do last week, month, year?
 License: GPLv2+
@@ -11,8 +11,9 @@ Source: https://github.com/psss/did/releases/download/%{version}/did-%{version}.
 BuildArch: noarch
 BuildRequires: git
 BuildRequires: python2-devel
-Requires: python-gssapi python2-requests-gssapi
+Requires: python2-requests-gssapi
 Requires: python-nitrate python2-dateutil python2-bugzilla
+Requires: python-feedparser
 
 %description
 Comfortably gather status report data (e.g. list of committed
@@ -44,6 +45,38 @@ install -pm 644 did.1.gz %{buildroot}%{_mandir}/man1
 %license LICENSE
 
 %changelog
+* Thu Dec 20 2018 Petr Šplíchal <psplicha@redhat.com> 0.12-1
+- Add missing redmine dependency [fix #177]
+- Fix GitLab plugin's ssl_verify option [fix #168]
+- Document GitLab access token scope
+- Merge ssl_verify support for Jira [#169]
+- Merge support for Trello commented cards [#170]
+- Fix commented cards title, improve the test suite
+- Add a simple test for completed tasks, update auth
+- Merge support for completed Google tasks [#173]
+- Merge fix for the Google dependencies [#166]
+- Document additional google dependencies
+- Adding support for Google tasks
+- Add commentCard to trello DEFAULT_FILTERS
+- Allow to set 'ssl_verify' config for jira plugin
+- Support 'creator' in bugzilla plugin [fix #167]
+- Give a nice error when user not found [fix #159]
+- Fix jira basic authentication [fix #163]
+- Fix long_description in setup.py
+- Update pip installation instructions
+- Update the example config with recent plugins
+- Describe in more detail how the tool works
+- Silently ignore non-git directories [fix #143]
+- Separate arguments preparation, add test coverage
+- New option --test to run a simple smoke test
+- Remove python2-gssapi from Requires
+- Make REQUESTS_CA_BUNDLE example copy-paste-able
+- Merge fix for the gitlab --since issue [fix #156]
+- Remove gssapi dependency from the main cli module
+- Quick start section, update install instructions
+- Simplify setup.py, update requires
+- Fix --since issue in gitlab plugin
+
 * Thu Nov 29 2018 Petr Šplíchal <psplicha@redhat.com> 0.11-3
 - Update dependencies: python-gssapi and python-nitrate
 
diff --git a/sources b/sources
index 72be3e3..3b1fcbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (did-0.11.tar.bz2) = 21dfd1003f6e4c420e23e3f0a698386ce239aa915cab346e2cfee7f00f1a003045812901c149ba3f12a52dc87c30ad884fc4c4a8a21dda8384d68747c179aed9
+SHA512 (did-0.12.tar.bz2) = 15e558bace972dc50fdf9a5120315f093397899907099e51983da24f984ffe03e490620f3510c91bf939d6a4d44c7382421ca3c0c24ef9674164b53070daf6d4