[LIBREPORT PATCH 1/2] use RHTSupport in RHEL workflows

[Michal Toman]

references RHBZ#917778

Signed-off-by: Michal Toman <mtoman(a)redhat.com&gt;
---
 src/workflows/workflow_RHELCCpp.xml.in       | 3 +--
 src/workflows/workflow_RHELKerneloops.xml.in | 2 +-
 src/workflows/workflow_RHELPython.xml.in     | 2 +-
 src/workflows/workflow_RHELvmcore.xml.in     | 3 +--
 src/workflows/workflow_RHELxorg.xml.in       | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/workflows/workflow_RHELCCpp.xml.in
b/src/workflows/workflow_RHELCCpp.xml.in
index 6376c5c..026062a 100644
--- a/src/workflows/workflow_RHELCCpp.xml.in
+++ b/src/workflows/workflow_RHELCCpp.xml.in
@@ -5,7 +5,6 @@
 
     <events>
         <event>collect_*</event>
-        <event>analyze_CCpp</event>
-        <event>report_Bugzilla</event>
+        <event>report_RHTSupport</event>
     </events>
 </workflow>
diff --git a/src/workflows/workflow_RHELKerneloops.xml.in
b/src/workflows/workflow_RHELKerneloops.xml.in
index 0baf010..7f84822 100644
--- a/src/workflows/workflow_RHELKerneloops.xml.in
+++ b/src/workflows/workflow_RHELKerneloops.xml.in
@@ -5,6 +5,6 @@
 
     <events>
         <event>collect_*</event>
-        <event>report_Bugzilla</event>
+        <event>report_RHTSupport</event>
     </events>
 </workflow>
diff --git a/src/workflows/workflow_RHELPython.xml.in
b/src/workflows/workflow_RHELPython.xml.in
index aec8576..a0a4aeb 100644
--- a/src/workflows/workflow_RHELPython.xml.in
+++ b/src/workflows/workflow_RHELPython.xml.in
@@ -5,6 +5,6 @@
 
     <events>
         <event>collect_*</event>
-        <event>report_Bugzilla</event>
+        <event>report_RHTSupport</event>
     </events>
 </workflow>
diff --git a/src/workflows/workflow_RHELvmcore.xml.in
b/src/workflows/workflow_RHELvmcore.xml.in
index 38fdc88..31712e0 100644
--- a/src/workflows/workflow_RHELvmcore.xml.in
+++ b/src/workflows/workflow_RHELvmcore.xml.in
@@ -4,8 +4,7 @@
     <_description>Process the kernel crash using the Red Hat
infrastructure</_description>
 
     <events>
-        <event>analyze_VMcore</event>
         <event>collect_*</event>
-        <event>report_Bugzilla</event>
+        <event>report_RHTSupport</event>
     </events>
 </workflow>
diff --git a/src/workflows/workflow_RHELxorg.xml.in
b/src/workflows/workflow_RHELxorg.xml.in
index b088b19..7dfda52 100644
--- a/src/workflows/workflow_RHELxorg.xml.in
+++ b/src/workflows/workflow_RHELxorg.xml.in
@@ -4,6 +4,6 @@
     <_description>Process the X Server problem using the Red Hat
infrastructure</_description>
 
     <events>
-        <event>report_Bugzilla</event>
+        <event>report_RHTSupport</event>
     </events>
 </workflow>
-- 
1.8.3.1

[LIBREPORT PATCH 2/2] SPEC: only pull RHTSupport by default on RHEL6

[Michal Toman]

references RHBZ#917778

Signed-off-by: Michal Toman <mtoman(a)redhat.com&gt;
---
 libreport.spec.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libreport.spec.in b/libreport.spec.in
index e638ad4..27644c5 100644
--- a/libreport.spec.in
+++ b/libreport.spec.in
@@ -98,7 +98,8 @@ Requires: libreport = %{version}-%{release}
 Provides: report = 0:0.23-1
 Obsoletes: report < 0:0.23-1
 # in report the rhtsupport is in the main package, so we need to install it too
-%if 0%{?rhel} >= 6
+# report is only in RHEL6, we do not need to carry the dependency to newer RHELs
+%if 0%{?rhel} == 6
 Requires: libreport-plugin-rhtsupport = %{version}-%{release}
 %endif
 
-- 
1.8.3.1

[Jakub Filak]

Pushed both. Thank you!