From 97735b62af4aa052c56fb3c5e70a1c775be4c42d Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo@redhat.com>
Date: Tue, 14 Nov 2017 17:30:52 +0100
Subject: [PATCH] Rebase on upstream 3.5

Resolves: BZ#1513030

Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
---
 .gitignore |  1 +
 sos.spec   | 13 ++++++++-----
 sources    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index a988e26..4e6cde3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ sos-2.2.tar.gz
 /sos-3.2.tar.gz
 /3.3.tar.gz
 /3.4.tar.gz
+/3.5.tar.gz
diff --git a/sos.spec b/sos.spec
index 43ccf53..d22c76f 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.4
-Release: 2%{?dist}
+Version: 3.5
+Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz
 License: GPLv2+
@@ -15,7 +15,6 @@ Requires: libxml2-python3
 Requires: bzip2
 Requires: xz
 Requires: python3-six
-Obsoletes: sos-plugins-openstack
 
 %description
 Sos is a set of tools that gathers information about system
@@ -48,6 +47,10 @@ install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sos.conf
 
 %changelog
+* Tue Nov 14 2017 Sandro Bonazzola <sbonazzo@fedoraproject.org> - 3.5-1
+- Rebase on upstream 3.5
+- Resolves: BZ#1513030
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
@@ -458,7 +461,7 @@ install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 
 * Tue Nov  1 2011 Bryn M. Reeves <bmr@redhat.com>
 - Do not collect subscription manager keys in general plugin
- 
+
 * Fri Sep 23 2011 Bryn M. Reeves <bmr@redhat.com>
 - Fix execution of RHN hardware.py from hardware plugin
 - Fix hardware plugin to support new lsusb path
@@ -494,7 +497,7 @@ install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 
 * Thu Apr 07 2011 Bryn M. Reeves <bmr@redhat.com>
 - Use sha256 for report digest when operating in FIPS mode
- 
+
 * Tue Apr 05 2011 Bryn M. Reeves <bmr@redhat.com>
 - Fix parted and dumpe2fs output on s390
 
diff --git a/sources b/sources
index 816426c..3b8997a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3.4.tar.gz) = 7ae09fecb06bf19f66b286d1228e88ac031ea37880525248129d71c632d916c4e79e389a584d2af27a6e2ca05bc0b43a11d4b9a9571b810f973354bd660a8b37
+SHA512 (3.5.tar.gz) = ddd2bd82e717964eea08e1a0a8fa9cde99ed472517316696fef0913d6876d385d5e2c28154472dbdc3b6a2829c9cad7d5f1019d2f21778271b01ae7199824f40