From 0a717aa8013931518dc4619c576d7d0e64b624ba Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo@redhat.com>
Date: Mon, 25 Jun 2018 11:52:33 +0200
Subject: [PATCH] Rebase on upstream 3.6 Resolves: BZ#1594443

---
 .gitignore |  1 +
 sos.spec   | 12 ++++++++----
 sources    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 709b06e..a36cdcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ sos-2.2.tar.gz
 /3.4.tar.gz
 /3.5.tar.gz
 /3.5.1.tar.gz
+/3.6.tar.gz
diff --git a/sos.spec b/sos.spec
index 0350378..6b83640 100644
--- a/sos.spec
+++ b/sos.spec
@@ -2,8 +2,8 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 3.5.1
-Release: 2%{?dist}
+Version: 3.6
+Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz
 License: GPLv2+
@@ -26,8 +26,8 @@ support technicians and developers.
 %setup -qn %{name}-%{version}
 
 %build
-# BZ1427445
-sed 's/@SOSVERSION@/%{version}/g' sos/__init__.py.in > sos/__init__.py
+# fix version, pushed upstream https://github.com/sosreport/sos/pull/1364
+sed -i 's/__version__ = "3.5"/__version__ = "3.6"/g' sos/__init__.py
 %py3_build
 
 %install
@@ -47,6 +47,10 @@ install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sos.conf
 
 %changelog
+* Mon Jun 25 2018 Sandro Bonazzola <sbonazzo@redhat.com> - 3.6-1
+- Rebase on upstream 3.6
+- Resolves: BZ#1594443
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.1-2
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index cc39ef3..85038c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3.5.1.tar.gz) = e8cb904dee25976b7261470795d713d0930c50d00a660cc6b279d9d90bb39b6e30c3a40c0444ee4213bc545c4b955d77190a7142255d6d7a0ac17534c651298b
+SHA512 (3.6.tar.gz) = a9622f7da4aa168c25cd6f68014d9efffa18009075efc878467e348b07277cd713dc251f83242522bbecb9b8ec0e8485ab5536ec6afa0203a07891837db0fac8