Skip to content
This repository was archived by the owner on Sep 15, 2020. It is now read-only.

Commit e42a595

Browse files
committed
[dist] Version bump to 1.6
Version 1.6 is now cut, primarily due to the recent drop of python-paramiko from the dependencies. Signed-off-by: Jake Hunsaker <[email protected]>
1 parent f20df9b commit e42a595

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

sos-collector.spec

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: Capture sosreports from multiple nodes simultaneously
22
Name: sos-collector
3-
Version: 1.5
3+
Version: 1.6
44
Release: 1%{?dist}
55
Source0: http://people.redhat.com/jhunsake/sos-collector/%{name}-%{version}.tar.gz
66
License: GPLv2
@@ -11,7 +11,7 @@ Obsoletes: clustersos < 1.2.2-2
1111
Provides: clustersos = %{version}-%{release}
1212

1313

14-
%if 0%{?rhel}
14+
%if 0%{?rhel} == 7
1515
BuildRequires: python-devel
1616
Requires: python-futures
1717
Requires: python-six
@@ -33,7 +33,7 @@ is run on the nodes.
3333
%setup -q
3434

3535
%build
36-
%if 0%{?rhel}
36+
%if 0%{?rhel} == 7
3737
%py2_build
3838
%else
3939
%py3_build
@@ -42,7 +42,7 @@ is run on the nodes.
4242
%install
4343
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
4444
install -p -m644 man/en/sos-collector.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
45-
%if 0%{?rhel}
45+
%if 0%{?rhel} == 7
4646
%py2_install
4747
%else
4848
%py3_install
@@ -51,15 +51,15 @@ install -p -m644 man/en/sos-collector.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
5151

5252

5353
%check
54-
%if 0%{?rhel}
54+
%if 0%{?rhel} == 7
5555
%{__python2} setup.py test
5656
%else
5757
%{__python3} setup.py test
5858
%endif
5959

6060
%files
6161
%{_bindir}/sos-collector
62-
%if 0%{?rhel}
62+
%if 0%{?rhel} == 7
6363
%{python2_sitelib}/*
6464
%else
6565
%{python3_sitelib}/*
@@ -69,6 +69,11 @@ install -p -m644 man/en/sos-collector.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
6969
%license LICENSE
7070

7171
%changelog
72+
* Tue Dec 11 2018 Jake Hunsaker <[email protected]> - 1.6-1
73+
- Drop paramiko dependency, use OpenSSH ControlPersist instead
74+
- Layered cluster profiles can now accept base profile options
75+
- Debian/Ubuntu hosts now supported
76+
7277
* Thu Oct 11 2018 Jake Hunsaker <[email protected]> - 1.5-1
7378
- New upstream release
7479
- Resolves CVE-2018-14650

soscollector/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1515

1616

17-
__version__ = '1.5'
17+
__version__ = '1.6'

0 commit comments

Comments
 (0)