--- rpms/smeserver-audittools/sme8/smeserver-audittools.spec	2008/10/07 15:47:39	1.5
+++ rpms/smeserver-audittools/sme8/smeserver-audittools.spec	2009/11/07 18:00:11	1.11
@@ -1,23 +1,17 @@
-# $Id$
+# $Id: smeserver-audittools.spec,v 1.10 2009/11/06 13:30:53 snetram Exp $
 
 Summary: SME Server auditing tools
 %define name smeserver-audittools
 Name: %{name}
 %define version 1.2.0
-%define release 1
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-audittools-0.0.2-pseudonymscommands.patch 
-Patch1: smeserver-audittools-0.0.2-printwarn.patch
-Patch2: smeserver-audittools-0.0.2-pseudonymwithoutdomain.patch 
-Patch3: smeserver-audittools-0.0.2-virtualdomains2pseudonyms.patch
-Patch4: smeserver-audittools-0.0.2-RenameFlags.patch
-Patch5: smeserver-audittools-0.0.2-newrpms.patch
-Patch6: smeserver-audittools-0.0.2-events.patch
-Patch7: smeserver-audittools-0.0.2-repositories.patch
+Patch0: smeserver-audittools-1.2.0-fix-yum-invocation.patch
+Patch1: smeserver-audittools-1.2.0-fix-dotted-usernames-and-groups.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-lib
@@ -29,6 +23,22 @@ Tools for consistency audits of SME Serv
 modifications prior to upgrades.
 
 %changelog
+* Sat Nov 7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-6.sme
+- Undo changes made in 1.2.0-5 [SME: 5572]
+- Properly fix output for usernames and groups containing a dot [SME: 5572]
+
+* Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-5.sme
+- Remove comment lines from output of aliases [SME: 5572]
+
+* Thu Nov 5 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-4.sme
+- Remove the leading path for yum in newrpms [SME: 5562]
+
+* Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-3.sme
+- Revert changes made in [SME: 5417]
+
+* Sat Aug 1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-2.sme
+- Sort the output of the repositories audittool alphabetically [SME: 5417]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 1.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -104,6 +114,8 @@ modifications prior to upgrades.
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build