Verified Commit 73341a7b authored by Louis Abel's avatar Louis Abel 📺
Browse files

Merge branch 'r8' into r8-beta

parents cfe396a4 883f3cff
......@@ -43,7 +43,7 @@ spec_change {
append {
field: "Release"
value: ".rocky.6.0"
value: ".rocky.6.3"
}
changelog {
......
diff --git a/SPECS/libreport.spec b/SPECS/libreport.spec
index dcea294..5042b88 100644
index dcea294..04ccfaa 100644
--- a/SPECS/libreport.spec
+++ b/SPECS/libreport.spec
@@ -283,14 +283,14 @@ Requires: libreport-web = %{version}-%{release}
......@@ -21,7 +21,7 @@ index dcea294..5042b88 100644
%package plugin-ureport
Summary: %{name}'s micro report plugin
@@ -299,30 +299,21 @@ Requires: %{name} = %{version}-%{release}
@@ -299,10 +299,10 @@ Requires: %{name} = %{version}-%{release}
Requires: libreport-web = %{version}-%{release}
%if 0%{?rhel}
%if %{with python2}
......@@ -34,17 +34,14 @@ index dcea294..5042b88 100644
%endif # with python3
%endif
%description plugin-ureport
Uploads micro-report to abrt server
@@ -315,14 +315,14 @@ Requires: %{name} = %{version}-%{release}
Requires: libreport-web = %{version}-%{release}
-%package plugin-rhtsupport
-Summary: %{name}'s RHTSupport plugin
-Requires: %{name} = %{version}-%{release}
-Requires: libreport-web = %{version}-%{release}
-
-%description plugin-rhtsupport
%description plugin-rhtsupport
-Plugin to report bugs into RH support system.
-
+Plugin to report bugs into RH support system. This contains no files on Rocky
+systems.
%if %{with bugzilla}
%package compat
Summary: %{name}'s compat layer for obsoleted 'report' package
......@@ -54,7 +51,35 @@ index dcea294..5042b88 100644
%description compat
Provides 'report' command-line tool.
@@ -385,9 +376,9 @@ Summary: Default configuration for reporting anaconda bugs
@@ -357,6 +357,8 @@ Default configuration for reporting bugs via Red Hat infrastructure
used to easily configure the reporting process for Red Hat systems. Just
install this package and you're done.
+This should contain no files on a Rocky system.
+
%package rhel-bugzilla
Summary: Default configuration for reporting bugs to Red Hat Bugzilla
Requires: %{name} = %{version}-%{release}
@@ -368,6 +370,8 @@ Default configuration for reporting bugs to Red Hat Bugzilla used to easily
configure the reporting process for Red Hat systems. Just install this package
and you're done.
+This should contain no files on a Rocky system.
+
%package rhel-anaconda-bugzilla
Summary: Default configuration for reporting anaconda bugs to Red Hat Bugzilla
Requires: %{name} = %{version}-%{release}
@@ -377,6 +381,9 @@ Requires: libreport-plugin-bugzilla = %{version}-%{release}
Default configuration for reporting Anaconda problems to Red Hat Bugzilla used
to easily configure the reporting process for Red Hat systems. Just install this
package and you're done.
+
+This should contain no files on a Rocky system.
+
%endif
%if %{with bugzilla}
@@ -385,9 +392,9 @@ Summary: Default configuration for reporting anaconda bugs
Requires: %{name} = %{version}-%{release}
Requires: libreport-plugin-reportuploader = %{version}-%{release}
%if 0%{?rhel}
......@@ -66,7 +91,7 @@ index dcea294..5042b88 100644
%endif
%description anaconda
@@ -464,7 +455,6 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml
@@ -464,7 +471,6 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml
%endif
# Remove unwanted RHEL specific workflow configuration files
......@@ -74,7 +99,7 @@ index dcea294..5042b88 100644
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELCCpp.xml
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELKerneloops.xml
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELPython.xml
@@ -496,10 +486,13 @@ rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf
@@ -496,10 +502,13 @@ rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf
......@@ -89,7 +114,7 @@ index dcea294..5042b88 100644
%check
make check|| {
@@ -724,36 +717,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -724,36 +733,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.*
%{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.*
......@@ -144,7 +169,7 @@ index dcea294..5042b88 100644
%if %{with bugzilla}
%files compat
@@ -792,55 +773,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -792,55 +789,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/report_fedora.conf.5.*
%endif
......@@ -200,3 +225,18 @@ index dcea294..5042b88 100644
%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf
%config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf
@@ -852,6 +805,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/bugzilla_formatdup_anaconda.conf.5.*
%endif
+%files plugin-rhtsupport
+
+%files rhel
+
+%files rhel-bugzilla
+
+%files rhel-anaconda-bugzilla
+
%changelog
* Tue Aug 18 2020 - Ernestas Kulik <ekulik@redhat.com> - 2.9.5-15
- Add patch for rhbz#1867064
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment