From f70ee56352ff8bc70a937ef25ee3ebdd5f25169192fbed7511c45f3fa5e717cf Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 2 Jul 2010 12:55:21 +0000
Subject: [PATCH] Accepting request 42082 from security

Copy from security/audit based on submit request 42082 from user jones_tony

OBS-URL: https://build.opensuse.org/request/show/42082
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audit?expand=0&rev=35
---
 README-BEFORE-ADDING-PATCHES | 15 ++++++++++-----
 audit-secondary.spec         |  2 +-
 audit.changes                |  6 ++++++
 audit.spec                   |  3 ++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/README-BEFORE-ADDING-PATCHES b/README-BEFORE-ADDING-PATCHES
index 2b70818..c26783a 100644
--- a/README-BEFORE-ADDING-PATCHES
+++ b/README-BEFORE-ADDING-PATCHES
@@ -1,8 +1,13 @@
 All patches need to have a patch description header similar to what is used in 
-kernel cvs.
+SuSE kernel git tree. Patches added without this will be reverted.  Thanks.
 
-Clear description of problem.
-Buzilla entry if applicable.
-Indication as to whether patch was upstreamed.
+From: Name <email>
+Subject: Summary of fix
+Date: date
+References: bnc#xxxxxx (bugzilla reference)
+Signed-Off-by: Name <email> (same as From: if committer is patch author)
+
+Short paragraph describing problem/fix.
+
+References to upstream repo/commit-id if applicable.
 
-Patches added without this will be reverted.  Thanks.
diff --git a/audit-secondary.spec b/audit-secondary.spec
index 3c70634..1d1ac79 100644
--- a/audit-secondary.spec
+++ b/audit-secondary.spec
@@ -26,7 +26,7 @@ Summary:        Python Bindings for libaudit
 License:        GPLv2+
 Group:          System/Monitoring
 Version:        2.0.4
-Release:        2
+Release:        3
 Url:            http://people.redhat.com/sgrubb/audit/
 Source0:        audit-%{version}.tar.bz2
 Patch1:         audit-plugins-path.patch
diff --git a/audit.changes b/audit.changes
index 757a8c7..1d505bb 100644
--- a/audit.changes
+++ b/audit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 25 21:22:51 UTC 2010 - tonyj@novell.com
+
+- Minor changes to README-BEFORE-ADDING-PATCHES file.
+- Add this file as %source in spec
+
 -------------------------------------------------------------------
 Fri Jun 25 17:50:31 CEST 2010 - dmueller@suse.de
 
diff --git a/audit.spec b/audit.spec
index 6b4d334..3eec4b0 100644
--- a/audit.spec
+++ b/audit.spec
@@ -23,7 +23,7 @@ BuildRequires:  gcc-c++ tcpd-devel
 BuildRequires:  kernel-headers >= 2.6.29
 Summary:        User Space Tools for 2.6 Kernel Auditing
 Version:        2.0.4
-Release:        2
+Release:        3
 License:        GPLv2+
 Group:          System/Monitoring
 Url:            http://people.redhat.com/sgrubb/audit/
@@ -31,6 +31,7 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        auditd.init
 Source2:        auditd.sysconfig
 Source3:        baselibs.conf
+Source4:        README-BEFORE-ADDING-PATCHES
 Patch1:         audit-no_python.patch
 Patch2:         audit-no_plugins.patch
 Patch3:         audit-no-gss.patch