From c42c750c64a19a0b9cccc5c812af8fdf1bb4100a Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Wed, 26 Oct 2011 15:41:11 -0400
Subject: [PATCH] Apply Miroslav patch that rewrites sealert option handling
 with using optparse. Fixing conflicting options problems.

---
 .gitignore          |  1 +
 setroubleshoot.spec | 12 +++++++-----
 sources             |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a18832..ef4e509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,4 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-3.0.33.tar.gz
 /setroubleshoot-3.0.37.tar.gz
 /setroubleshoot-3.0.38.tar.gz
+/setroubleshoot-3.0.40.tar.gz
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index e93e559..b399cf4 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 3.0.38
-Release: 3%{?dist}
+Version: 3.0.40
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -15,7 +15,6 @@ BuildRequires: libcap-ng-devel
 BuildRequires: intltool gettext python
 BuildRequires: desktop-file-utils dbus-glib-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel
 Requires: %{name}-server = %{version}-%{release} 
-Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2-libglade >= 2.9.2
 Requires: gtk2
 Requires: dbus
@@ -98,13 +97,13 @@ touch %{buildroot}%{pkgvardatadir}/email_alert_recipients
 Summary: SELinux troubleshoot server
 Group: Applications/System
 
-Requires: %{name}-plugins >= 2.0.4
+Requires: %{name}-plugins >= 3.0.14
 Requires: audit >= 1.2.6-3
 Requires: audit-libs-python >= 1.2.6-3
 Requires: libxml2-python
 Requires: setools-libs-python
 Requires: rpm-python
-Requires: libselinux-python  >= 1.30.15-1
+Requires: libselinux-python  >= 2.1.5-1
 Requires: policycoreutils-python 
 BuildRequires: intltool gettext python
 BuildRequires: setools-devel >= 3.3.6-3
@@ -203,6 +202,9 @@ Setroubleshoot documentation package
 %{pkgdocdir}/setroubleshoot*
 
 %changelog
+* Wed Oct 26 2011  <dwalsh@redhat.com> - 3.0.40-1
+- Apply Miroslav patch that rewrites sealert option handling with using optparse. Fixing conflicting options problems.
+
 * Fri Aug 26 2011  <dwalsh@redhat.com> - 3.0.38-3
 - Fix requires to include pygtk2-libglade
 
diff --git a/sources b/sources
index f035bac..27bfc32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ae1b0c5a026a54cdc9d98bd13d52d18  setroubleshoot-3.0.38.tar.gz
+4f2a03f276f490cfbaa4f48a4d19b757  setroubleshoot-3.0.40.tar.gz