AlmaLinux changes

This commit is contained in:
eabdullin 2022-05-18 13:50:23 +03:00
parent ae2d36afce
commit edd1819ae5
2 changed files with 1724 additions and 94 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,4 @@
%global dist %{?dist}.alma
%if 0%{?suse_version} %if 0%{?suse_version}
%bcond_with bugzilla %bcond_with bugzilla
@ -22,6 +23,9 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta
Patch1: 0001-Change-the-default-Bugzilla-group.patch Patch1: 0001-Change-the-default-Bugzilla-group.patch
Patch2: 0002-rhbz-Be-a-little-bit-more-defensive-when-working-wit.patch Patch2: 0002-rhbz-Be-a-little-bit-more-defensive-when-working-wit.patch
Patch3: 0003-rhbz-Retry-XML-RPC-calls-when-uploading-attachments.patch Patch3: 0003-rhbz-Retry-XML-RPC-calls-when-uploading-attachments.patch
# AlmaLinux: add almalinux plugin
Patch9100: 9100-Add-almalinux-plugin.patch
BuildRequires: %{dbus_devel} BuildRequires: %{dbus_devel}
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: curl-devel BuildRequires: curl-devel
@ -205,14 +209,14 @@ Requires: libreport-web = %{version}-%{release}
%description plugin-mantisbt %description plugin-mantisbt
Plugin to report bugs into the mantisbt. Plugin to report bugs into the mantisbt.
%package centos %package almalinux
Summary: %{name}'s CentOS Bug Tracker workflow Summary: %{name}'s AlmaLinux Bug Tracker workflow
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libreport-web = %{version}-%{release} Requires: libreport-web = %{version}-%{release}
Requires: libreport-plugin-mantisbt = %{version}-%{release} Requires: libreport-plugin-mantisbt = %{version}-%{release}
%description centos %description almalinux
Workflows to report issues into the CentOS Bug Tracker. Workflows to report issues into the AlmaLinux Bug Tracker.
%package plugin-ureport %package plugin-ureport
Summary: %{name}'s micro report plugin Summary: %{name}'s micro report plugin
@ -231,40 +235,6 @@ Requires: libreport-web = %{version}-%{release}
%description plugin-reportuploader %description plugin-reportuploader
Plugin to report bugs into anonymous FTP site associated with ticketing system. Plugin to report bugs into anonymous FTP site associated with ticketing system.
%if 0%{?fedora} || 0%{?eln}
%package fedora
Summary: Default configuration for reporting bugs via Fedora infrastructure
Requires: %{name} = %{version}-%{release}
%description fedora
Default configuration for reporting bugs via Fedora infrastructure
used to easily configure the reporting process for Fedora systems. Just
install this package and you're done.
%endif
%if 0%{?rhel} && ! 0%{?eln}
%package rhel-bugzilla
Summary: Default configuration for reporting bugs to Red Hat Bugzilla
Requires: %{name} = %{version}-%{release}
Requires: libreport-plugin-bugzilla = %{version}-%{release}
Requires: libreport-plugin-ureport = %{version}-%{release}
%description rhel-bugzilla
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.
%package rhel-anaconda-bugzilla
Summary: Default configuration for reporting anaconda bugs to Red Hat Bugzilla
Requires: %{name} = %{version}-%{release}
Requires: libreport-plugin-bugzilla = %{version}-%{release}
%description rhel-anaconda-bugzilla
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.
%endif
%if %{with bugzilla} %if %{with bugzilla}
%package anaconda %package anaconda
Summary: Default configuration for reporting anaconda bugs Summary: Default configuration for reporting anaconda bugs
@ -281,6 +251,9 @@ data over ftp/scp...
%prep %prep
%autosetup -p 1 %autosetup -p 1
# AlmaLinux: reuse existing centos plugin translations for almalinux plugin
sed -e 's/CentOS/AlmaLinux/g' -i po/*.po
sed -e 's/centos/almalinux/g' -i po/*.po
%build %build
./autogen.sh ./autogen.sh
@ -339,7 +312,6 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml
%endif %endif
# Remove unwanted RHEL specific workflow configuration files # Remove unwanted RHEL specific workflow configuration files
%if ! 0%{?rhel} || 0%{?eln}
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_uReport.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_uReport.xml
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHELBugzilla.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHELBugzilla.xml
rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaCCpp.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaCCpp.xml
@ -362,7 +334,28 @@ rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf
rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5
rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5
%endif rm -f %{buildroot}%{_mandir}/man1/reporter-rhtsupport.1
rm -f %{buildroot}%{_mandir}/man5/rhtsupport.conf.5
rm -f %{buildroot}%{_mandir}/man5/rhtsupport_event.conf.5
rm -f %{buildroot}/%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.rhtsupport.xml
# Remove unwanted CentOS specific workflow configuration files
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSCCpp.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSKerneloops.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSPython.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSPython3.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSVmcore.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSXorg.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSLibreport.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSJava.xml
rm -f %{buildroot}/%{_datadir}/%{name}/workflows/workflow_CentOSJavaScript.xml
rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_centos.conf
rm -f %{buildroot}/%{_mandir}/man5/report_centos.conf.5
rm -f %{buildroot}/%{_datadir}/%{name}/events/report_CentOSBugTracker.xml
rm -f %{buildroot}/%{_sysconfdir}/libreport/events/report_CentOSBugTracker.conf
rm -f %{buildroot}/%{_mandir}/man5/report_CentOSBugTracker.conf.5
rm -f %{buildroot}/%{_sysconfdir}/libreport/events.d/centos_report_event.conf
rm -f %{buildroot}/%{_mandir}/man5/centos_report_event.conf.5
%check %check
make check|| { make check|| {
@ -524,11 +517,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/reporter-ureport.1.gz %{_mandir}/man1/reporter-ureport.1.gz
%{_mandir}/man5/ureport.conf.5.gz %{_mandir}/man5/ureport.conf.5.gz
%{_datadir}/%{name}/events/report_uReport.xml %{_datadir}/%{name}/events/report_uReport.xml
%if 0%{?rhel} && ! 0%{?eln}
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_uReport.conf
%{_datadir}/%{name}/workflows/workflow_uReport.xml
%{_mandir}/man5/report_uReport.conf.5.*
%endif
%if %{with bugzilla} %if %{with bugzilla}
%files plugin-bugzilla %files plugin-bugzilla
@ -571,24 +559,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.* %{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.*
%{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.* %{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.*
%files centos %files almalinux
%{_datadir}/%{name}/workflows/workflow_CentOSCCpp.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxCCpp.xml
%{_datadir}/%{name}/workflows/workflow_CentOSKerneloops.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxKerneloops.xml
%{_datadir}/%{name}/workflows/workflow_CentOSPython.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxPython.xml
%{_datadir}/%{name}/workflows/workflow_CentOSPython3.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxPython3.xml
%{_datadir}/%{name}/workflows/workflow_CentOSVmcore.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxVmcore.xml
%{_datadir}/%{name}/workflows/workflow_CentOSXorg.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxXorg.xml
%{_datadir}/%{name}/workflows/workflow_CentOSLibreport.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxLibreport.xml
%{_datadir}/%{name}/workflows/workflow_CentOSJava.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxJava.xml
%{_datadir}/%{name}/workflows/workflow_CentOSJavaScript.xml %{_datadir}/%{name}/workflows/workflow_AlmaLinuxJavaScript.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_centos.conf %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_almalinux.conf
%{_mandir}/man5/report_centos.conf.5.* %{_mandir}/man5/report_almalinux.conf.5.*
%{_datadir}/%{name}/events/report_CentOSBugTracker.xml %{_datadir}/%{name}/events/report_AlmaLinuxBugTracker.xml
%config(noreplace) %{_sysconfdir}/libreport/events/report_CentOSBugTracker.conf %config(noreplace) %{_sysconfdir}/libreport/events/report_AlmaLinuxBugTracker.conf
%{_mandir}/man5/report_CentOSBugTracker.conf.5.* %{_mandir}/man5/report_AlmaLinuxBugTracker.conf.5.*
# report_CentOSBugTracker events are shipped by libreport package # report_AlmaLinuxBugTracker events are shipped by libreport package
%config(noreplace) %{_sysconfdir}/libreport/events.d/centos_report_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/almalinux_report_event.conf
%{_mandir}/man5/centos_report_event.conf.5.gz %{_mandir}/man5/almalinux_report_event.conf.5.gz
%files plugin-reportuploader %files plugin-reportuploader
%{_mandir}/man*/reporter-upload.* %{_mandir}/man*/reporter-upload.*
@ -606,37 +594,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.conf %config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.conf
%{_mandir}/man5/report_Uploader.conf.5.* %{_mandir}/man5/report_Uploader.conf.5.*
%if 0%{?fedora} || 0%{?eln}
%files fedora
%{_datadir}/%{name}/workflows/workflow_FedoraCCpp.xml
%{_datadir}/%{name}/workflows/workflow_FedoraKerneloops.xml
%{_datadir}/%{name}/workflows/workflow_FedoraPython.xml
%{_datadir}/%{name}/workflows/workflow_FedoraPython3.xml
%{_datadir}/%{name}/workflows/workflow_FedoraVmcore.xml
%{_datadir}/%{name}/workflows/workflow_FedoraXorg.xml
%{_datadir}/%{name}/workflows/workflow_FedoraLibreport.xml
%{_datadir}/%{name}/workflows/workflow_FedoraJava.xml
%{_datadir}/%{name}/workflows/workflow_FedoraJavaScript.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
%{_mandir}/man5/report_fedora.conf.5.*
%endif
%if 0%{?rhel} && ! 0%{?eln}
%files rhel-bugzilla
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaCCpp.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaKerneloops.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaPython.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaVmcore.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaXorg.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaLibreport.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaJava.xml
%{_datadir}/%{name}/workflows/workflow_RHELBugzillaJavaScript.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf
%{_mandir}/man5/report_rhel_bugzilla.conf.5.*
%files rhel-anaconda-bugzilla
%{_datadir}/%{name}/workflows/workflow_AnacondaRHELBugzilla.xml
%endif
%if %{with bugzilla} %if %{with bugzilla}
%files anaconda %files anaconda
@ -655,6 +612,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%changelog %changelog
* Wed May 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 2.15.2-6.alma
- Add support for AlmaLinux Bug Tracker
- Remove libreport-rhel-bugzilla and libreport-rhel-anaconda-bugzilla
* Mon Jan 17 2022 Michal Srb <michal@redhat.com> - 2.15.2-6 * Mon Jan 17 2022 Michal Srb <michal@redhat.com> - 2.15.2-6
- [reporter-bugzilla] Retry XML-RPC calls - [reporter-bugzilla] Retry XML-RPC calls
- Resolves: rhbz#2037399 - Resolves: rhbz#2037399