#19 Minor ELN conditional fixes
Merged 3 years ago by mgrabovs. Opened 3 years ago by merlinm.
rpms/ merlinm/gnome-abrt eln  into  master

file modified
+7 -2
@@ -37,7 +37,7 @@ 

  BuildRequires: python3-libreport

  BuildRequires: abrt-gui-devel > 2.4.0

  BuildRequires: gtk3-devel

- %if 0%{?fedora}

+ %if 0%{?fedora} || 0%{?rhel} >= 9

  BuildRequires: python3-pylint

  BuildRequires: python3-six

  BuildRequires: python3-inotify
@@ -64,7 +64,9 @@ 

  

  %build

  %meson \

-     %{!?fedora:-Dlint=false} \

+ %if 0%{?rhel} && 0%{?rhel} < 9

+     -Dlint=false \

+ %endif

      %{nil}

  %meson_build

  
@@ -90,6 +92,9 @@ 

  %{_datadir}/icons/hicolor/*/apps/*

  

  %changelog

+ * Wed Aug 05 2020 Merlin Mathesius <mmathesi@redhat.com> - 1.3.5-5

+ - Minor ELN conditional fixes

+ 

  * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-5

  - Second attempt - Rebuilt for

    https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Pull-Request has been merged by mgrabovs

3 years ago

Could we not do cowboy merging here and make sure that the changes land upstream first?

Metadata