From 4a108b6318612972f266ff790a19e109c51871e0 Mon Sep 17 00:00:00 2001
From: Adam Stokes <astokes@fedoraproject.org>
Date: Mon, 18 Jan 2010 20:57:08 +0000
Subject: [PATCH] updates from fixes reported by rhbz, progressbar fixes

---
 sos.spec | 16 +++++++++++++---
 sources  |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sos.spec b/sos.spec
index 872bbc9..8ac7cf7 100644
--- a/sos.spec
+++ b/sos.spec
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 18%{?dist}
+Release: 21%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -53,6 +53,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Mon Jan 18 2010 Adam Stokes <ajs at redhat dot com> = 1.8-21
+- more sanitizing options for log files
+- rhbz fixes from RHEL version merged into trunk
+- progressbar update
+
+* Tue Nov 19 2009 Adam Stokes <ajs at redhat dot com> = 1.8-20
+- dont copy unwanted files due to symlinks
+- More plugin enhancements
+
 * Tue Nov 5 2009 Adam Stokes <ajs at redhat dot com> = 1.8-18
 - Option to enable selinux fixfiles check
 - Start of replacing Thread module with multiprocessing
@@ -86,8 +95,8 @@ rm -rf ${RPM_BUILD_ROOT}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Jan 21 2009 Adam Stokes <ajs at redhat dot com> - 1.8-9
-- Resolves: bz436053 /usr/share/sos is not owned by any package 
-- Resolves: bz434626 Wrong directory structure for translations 
+- Resolves: bz436053 /usr/share/sos is not owned by any package
+- Resolves: bz434626 Wrong directory structure for translations
 
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this
@@ -327,3 +336,4 @@ rm -rf ${RPM_BUILD_ROOT}
 
 * Mon May 22 2006 John Berninger <jwb at redhat dot com> - 0.1-1
 - initial package build
+
diff --git a/sources b/sources
index 6859e5a..991c262 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc841fd760558594bb189d745fc67f0c  sos-1.8.tar.gz
+82ca1eeff1aa208c7088d78e8aab8d07  sos-1.8.tar.gz