diff --git a/.gitignore b/.gitignore index cd22f3a..499fbbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/sassist-0.8.5.tar.gz +SOURCES/sassist-0.8.6.tar.gz diff --git a/.sassist.metadata b/.sassist.metadata index f85fab3..dead483 100644 --- a/.sassist.metadata +++ b/.sassist.metadata @@ -1 +1 @@ -4991908bcdb0ba48fff7371748f846f280c3c6a8 SOURCES/sassist-0.8.5.tar.gz +14435657c11cf1e9dbe5680aa3a2aaa53eb5ce1d SOURCES/sassist-0.8.6.tar.gz diff --git a/SOURCES/sassist-7256a6a35.patch b/SOURCES/sassist-7256a6a35.patch deleted file mode 100644 index 6496a4e..0000000 --- a/SOURCES/sassist-7256a6a35.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 7256a6a35eeefd0ca6992eabd6283aadc7dfd4eb -Author: Charles Rose -Date: Mon Feb 18 16:34:16 2019 -0500 - - script: zip fails with sockets - - zip fails when archive contains socket files. sosreport removes - them anyway. If sosreport supported 'zip' compression, this would - have not been an issue. - -diff --git a/src/sassist.sh b/src/sassist.sh -index be07d0e..49fb65c 100755 ---- a/src/sassist.sh -+++ b/src/sassist.sh -@@ -67,6 +67,7 @@ do_sosreport() - --tmp-dir ${TMP_DIR} --build --quiet \ - --name ${SVCTAG} || return 1 - -+ find ${TMP_DIR} -type s -exec rm -f '{}' \; - $(cd ${TMP_DIR}/sosreport-* && zip -y -q -r ${OUTFILE_F} . ) - } - diff --git a/SPECS/sassist.spec b/SPECS/sassist.spec index 0bd15af..b6bc1d3 100644 --- a/SPECS/sassist.spec +++ b/SPECS/sassist.spec @@ -1,6 +1,6 @@ Name: sassist -Version: 0.8.5 -Release: 4%{?dist} +Version: 0.8.6 +Release: 1%{?dist} Summary: Dell SupportAssist log collector License: MIT @@ -20,7 +20,6 @@ Requires: zip BuildArch: noarch %{?systemd_requires} -Patch0: sassist-7256a6a35.patch %description Dell SupportAssist log collector for Linux. @@ -56,6 +55,9 @@ install -p -m644 src/systemd/run-media-iDRAC_NATOSC.mount %{buildroot}%{_unitdir %systemd_postun_with_restart sassist.service %changelog +* Tue May 26 2020 Neil Horman - 0.8.6-1 +- Update to latest upstream (bz 1821434) + * Wed Dec 18 2019 Neil Horman - 0.8.5-4 - Rev bump for rebuild (bz 1678863)