diff --git a/libreport.spec b/libreport.spec index 501c18c..80daa52 100644 --- a/libreport.spec +++ b/libreport.spec @@ -15,7 +15,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.14.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -219,7 +219,7 @@ Summary: %{name}'s micro report plugin BuildRequires: %{libjson_devel} Requires: %{name} = %{version}-%{release} Requires: libreport-web = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?eln} Requires: python3-subscription-manager-rhsm %endif @@ -234,7 +234,7 @@ Requires: libreport-web = %{version}-%{release} %description plugin-reportuploader Plugin to report bugs into anonymous FTP site associated with ticketing system. -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?eln} %package fedora Summary: Default configuration for reporting bugs via Fedora infrastructure Requires: %{name} = %{version}-%{release} @@ -245,7 +245,7 @@ used to easily configure the reporting process for Fedora systems. Just install this package and you're done. %endif -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?eln} %package rhel-bugzilla Summary: Default configuration for reporting bugs to Red Hat Bugzilla Requires: %{name} = %{version}-%{release} @@ -273,7 +273,7 @@ package and you're done. Summary: Default configuration for reporting anaconda bugs Requires: %{name} = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release} -%if ! 0%{?rhel} +%if ! 0%{?rhel} || 0%{?eln} Requires: libreport-plugin-bugzilla = %{version}-%{release} %endif @@ -326,7 +326,7 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/workflows/ rm -f %{buildroot}/%{_infodir}/dir # Remove unwanted Fedora specific workflow configuration files -%if 0%{!?fedora:1} +%if ! 0%{?fedora} && ! 0%{?eln} rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_FedoraCCpp.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_FedoraKerneloops.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_FedoraPython.xml @@ -342,7 +342,7 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml %endif # Remove unwanted RHEL specific workflow configuration files -%if 0%{!?rhel:1} +%if ! 0%{?rhel} || 0%{?eln} 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_RHELBugzillaCCpp.xml @@ -525,7 +525,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/reporter-ureport.1.gz %{_mandir}/man5/ureport.conf.5.gz %{_datadir}/%{name}/events/report_uReport.xml -%if 0%{?rhel} +%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.* @@ -607,7 +607,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.conf %{_mandir}/man5/report_Uploader.conf.5.* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?eln} %files fedora %{_datadir}/%{name}/workflows/workflow_FedoraCCpp.xml %{_datadir}/%{name}/workflows/workflow_FedoraKerneloops.xml @@ -622,7 +622,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/report_fedora.conf.5.* %endif -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?eln} %files rhel-bugzilla %{_datadir}/%{name}/workflows/workflow_RHELBugzillaCCpp.xml %{_datadir}/%{name}/workflows/workflow_RHELBugzillaKerneloops.xml @@ -641,10 +641,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %if %{with bugzilla} %files anaconda -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?eln} %{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml %endif -%if 0%{?rhel} +%if 0%{?rhel} && ! 0%{?eln} %{_datadir}/%{name}/workflows/workflow_AnacondaRHEL.xml %endif %{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml @@ -659,6 +659,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Aug 19 2020 Merlin Mathesius - 2.14.0-6 +- Updates so ELN builds in a Fedora-like reporting configuration, even though + the %%{rhel} macro is set. + * Thu Aug 13 2020 Michal Fabik 2.14.0-3 - forbidden_words: Add potentially sensitive env vars - lib: Add version script for libreport