diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 6c6daa5..bb1d428 100644 --- a/SPECS/oscap-anaconda-addon.spec +++ b/SPECS/oscap-anaconda-addon.spec @@ -3,7 +3,7 @@ Name: oscap-anaconda-addon Version: 1.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -24,6 +24,7 @@ Patch3: oaa-1.2_warn-nfs-utils.patch Patch4: oaa-1.2_lang-streamline.patch Patch5: oaa-1.2_spoke-window_PR122.patch Patch6: oaa-1.2-unicode_issues_PR124.patch +Patch7: oscap-anaconda-addon-1.2-new_package_groups-PR_128.patch BuildArch: noarch BuildRequires: gettext @@ -51,6 +52,7 @@ content. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # As patches may translates the strings that are updated by later patches, # Patch1 needs to be aplied last. @@ -76,6 +78,9 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog +* Wed Nov 11 11:46:56 CET 2020 Matej Tyc - 1.1.1-6 +- Improved handling of conflicts between packages removed vs software wanted to be installed - rhbz#1892310 + * Tue Aug 18 2020 Matěj Týč - 1.1.1-5 - Fixed issues with encountering filenames with weird encoding during scans - rhbz#1867960