From 579a0b7a3540804a044f0e6227fef30ace492f0e Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Wed, 11 Feb 2015 11:28:59 +0100
Subject: [PATCH] Provide the policy rpm in Bugzilla bug reports by
 jfilak@redhat.com setroubleshoot-3.2.21-1

---
 .gitignore                                    |  1 +
 ...e-policy-rpm-in-Bugzilla-bug-reports.patch | 50 -------------------
 setroubleshoot.spec                           | 17 ++++---
 sources                                       |  2 +-
 4 files changed, 12 insertions(+), 58 deletions(-)
 delete mode 100644 0001-Provide-the-policy-rpm-in-Bugzilla-bug-reports.patch

diff --git a/.gitignore b/.gitignore
index 236dfd4..080395b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,3 +181,4 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-3.2.17.tar.gz
 /setroubleshoot-3.2.18.tar.gz
 /setroubleshoot-3.2.20.tar.gz
+/setroubleshoot-3.2.21.tar.gz
diff --git a/0001-Provide-the-policy-rpm-in-Bugzilla-bug-reports.patch b/0001-Provide-the-policy-rpm-in-Bugzilla-bug-reports.patch
deleted file mode 100644
index 32011ed..0000000
--- a/0001-Provide-the-policy-rpm-in-Bugzilla-bug-reports.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bf0c9f733cc6b98cc1ff753d61c4316653615705 Mon Sep 17 00:00:00 2001
-From: Jakub Filak <jfilak@redhat.com>
-Date: Fri, 4 Apr 2014 15:30:24 +0200
-Subject: [PATCH] Provide the policy rpm in Bugzilla bug reports
-
-This patch adds the policy rpm string to the user comments of an already
-reported bug.
-
-Every comment will contain the following string:
-
-    Version-Release number of selected component:
-    selinux-policy-X.XX.X-XXX.YYY.noarch
-
-Signed-off-by: Jakub Filak <jfilak@redhat.com>
----
- framework/src/setroubleshoot/browser.py   | 3 ++-
- framework/src/setroubleshoot/signature.py | 3 +++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/framework/src/setroubleshoot/browser.py b/framework/src/setroubleshoot/browser.py
-index 06a7276..04c5d68 100644
---- a/framework/src/setroubleshoot/browser.py
-+++ b/framework/src/setroubleshoot/browser.py
-@@ -966,7 +966,8 @@ class BugReport:
-                                                 "setroubleshoot", 
-                                                 self.alert.get_hash(), 
-                                                 self.summary, 
--                                                content)
-+                                                content,
-+                                                package=self.alert.get_policy_rpm())
-  
-         try:
-             rc = report.report(signature, report.io.GTKIO.GTKIO(self.parent.accounts))
-diff --git a/framework/src/setroubleshoot/signature.py b/framework/src/setroubleshoot/signature.py
-index dcf701a..a9fe78b 100755
---- a/framework/src/setroubleshoot/signature.py
-+++ b/framework/src/setroubleshoot/signature.py
-@@ -295,6 +295,9 @@ class SEFaultSignatureInfo(XmlSerialize):
-         for name in self.merge_include:
-             setattr(self, name, getattr(siginfo, name))
- 
-+    def get_policy_rpm(self):
-+        return self.environment.policy_rpm;
-+
-     def get_hash_str(self):
-         return  "%s,%s,%s,%s,%s" % (self.source, self.scontext.type, self.tcontext.type, self.tclass, ",".join(self.sig.access))
- 
--- 
-1.8.3.1
-
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index 0e5967b..d55275e 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,15 +1,16 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 3.2.20
-Release: 3%{?dist}
+Version: 3.2.21
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
-# git clone git://git.fedorahosted.org/git/setroubleshoot.git; cd setroubleshoot
-# git archive --prefix setroubleshoot-3.0.10/426cf8ea7a38e8c5179981219d831368161b65f2 > setroubleshoot-3.0.10.tar.gz
+# git clone https://github.com/fedora-selinux/setroubleshoot.git
+# cd setroubleshoot/framework/
+# git checkout setroubleshoot-%{version}
+# ./autogen.sh
+# make dist
 Source0: %{name}-%{version}.tar.gz
-Patch1: 0001-Provide-the-policy-rpm-in-Bugzilla-bug-reports.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: libcap-ng-devel
 BuildRequires: intltool gettext python
@@ -73,7 +74,6 @@ fi
 
 %prep
 %setup -q
-%patch1 -p 2 -b .reports
 
 %build
 %configure
@@ -171,6 +171,9 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
 
 %changelog
+* Tue Feb 10 2015 Petr Lautrbach <plautrba@redhat.com> 3.2.21-1
+- Provide the policy rpm in Bugzilla bug reports by jfilak@redhat.com
+
 * Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 3.2.20-3
 - Rebuild for rpm bug 1131960
 
diff --git a/sources b/sources
index c227966..7552792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ba703a90bc3fa85e1e6c9f7e17ab1e4  setroubleshoot-3.2.20.tar.gz
+b67c6ae7ed75ac0ef403a2d1207f1d02  setroubleshoot-3.2.21.tar.gz