Blob Blame Raw
From 4833e53ab69811559855a725069315b04ba7246d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 10 Jan 2018 09:06:05 +0100
Subject: [PATCH 12/22] remove rhel6 specific items and accomodate to rhel7+

---
 libreport.spec.in | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/libreport.spec.in b/libreport.spec.in
index ae69d65f..63f5114a 100644
--- a/libreport.spec.in
+++ b/libreport.spec.in
@@ -41,7 +41,7 @@ BuildRequires: libproxy-devel
 BuildRequires: satyr-devel >= 0.24
 BuildRequires: glib2-devel >= %{glib_ver}
 
-%if 0%{?fedora} >= 24
+%if 0%{?fedora} >= 24 || 0%{?rhel} > 7
 # A test case uses zh_CN locale to verify XML event translations
 BuildRequires: glibc-all-langpacks
 %endif
@@ -96,11 +96,6 @@ Development headers for libreport-web
 Summary: Python bindings for report-libs
 Requires: libreport = %{version}-%{release}
 Requires: python2-dnf
-# in report the rhtsupport is in the main package, so we need to install it too
-# report is only in RHEL6, we do not need to carry the dependency to newer RHELs
-%if 0%{?rhel} == 6
-Requires: libreport-plugin-rhtsupport = %{version}-%{release}
-%endif
 %{?python_provide:%python_provide python2-libreport}
 # Remove before F30
 Provides: %{name}-python = %{version}-%{release}
@@ -330,12 +325,7 @@ CFLAGS="%{optflags} -Werror" %configure \
 %if %{without bugzilla}
         --without-bugzilla \
 %endif
-%if 0%{?rhel} == 6
-        --with-defaultdumpdirmode=0640 \
-        --disable-userownsdumpdir \
-%else
         --enable-doxygen-docs \
-%endif
         --disable-silent-rules
 
 make %{?_smp_mflags}
-- 
2.14.3