Rebase on upstream 3.4

Resolves: BZ#1436969
Resolves: BZ#1427445

.gitignore

@@ -4,3 +4,4 @@ sos-2.2.tar.gz
 /sos-55c89eb6810e7060845082845653b059aab90e3d.tar.gz
 /sos-3.2.tar.gz
 /3.3.tar.gz
+/3.4.tar.gz

sos.spec

@@ -2,7 +2,7 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 3.3
+Version: 3.4
 Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz
@@ -14,6 +14,7 @@ BuildRequires: gettext
 Requires: libxml2-python3
 Requires: bzip2
 Requires: xz
+Requires: python3-six
 Obsoletes: sos-plugins-openstack
 
 %description
@@ -26,6 +27,8 @@ support technicians and developers.
 %setup -qn %{name}-%{version}
 
 %build
+# BZ1427445
+sed 's/@SOSVERSION@/%{version}/g' sos/__init__.py.in > sos/__init__.py
 %py3_build
 
 %install
@@ -45,6 +48,11 @@ install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sos.conf
 
 %changelog
+* Wed Mar 29 2017 Sandro Bonazzola <sbonazzo@fedoraproject.org> - 3.4-1
+- Rebase on upstream 3.4
+- Resolves: BZ#1436969
+- Resolves: BZ#1427445
+
 * Thu Feb 23 2017 Sandro Bonazzola <sbonazzo@fedoraproject.org> - 3.3-1
 - Rebase on upstream 3.3
 - Resolves: BZ#1411314

sources

@@ -1 +1 @@
-SHA512 (3.3.tar.gz) = 9938167ce706e9fc2e2665cc8a1f38726ad40e6c786fd450a884621af179eb547956433c330ace07c880e7b2dd3ba62ca3f3f5c2f0e211d24a768c21ebd0c4e1
+SHA512 (3.4.tar.gz) = 7ae09fecb06bf19f66b286d1228e88ac031ea37880525248129d71c632d916c4e79e389a584d2af27a6e2ca05bc0b43a11d4b9a9571b810f973354bd660a8b37