Cleanup spec file conditionals

gdb.spec

@@ -26,7 +26,7 @@ Version: 8.0.1
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 26%{?dist}
+Release: 27%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -114,7 +114,7 @@ Recommends: default-yama-scope
 %if 0%{?el7:1}
 %global librpmver 3
 %else
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
 %global librpmver 8
 %else
 %global librpmver 7
@@ -762,7 +762,7 @@ BuildRequires: texlive-collection-latexrecommended
 %endif
 # Permit rebuilding *.[0-9] files even if they are distributed in gdb-*.tar:
 BuildRequires: /usr/bin/pod2man
-%if 0%{!?rhel:1}
+%if 0%{!?rhel:1} || 0%{?rhel} > 7
 BuildRequires: libbabeltrace-devel%{buildisa}
 BuildRequires: guile-devel%{buildisa}
 %endif
@@ -834,7 +834,7 @@ BuildRequires: prelink
 BuildRequires: libmpx%{bits_local} libmpx%{bits_other}
 BuildRequires: opencl-headers ocl-icd-devel%{bits_local} ocl-icd-devel%{bits_other}
 %endif
-%if 0%{!?rhel:1}
+%if 0%{!?rhel:1} || 0%{?rhel} > 7
 # Fedora arm+ppc64le do not yet have fpc built.
 %ifnarch %{arm} ppc64le
 BuildRequires: fpc
@@ -1263,7 +1263,7 @@ export CXXFLAGS="$CFLAGS"
 	--with-separate-debug-dir=/usr/lib/debug		\
 	--disable-sim						\
 	--disable-rpath						\
-%if 0%{!?rhel:1}
+%if 0%{!?rhel:1} || 0%{?rhel} > 7
 	--with-babeltrace					\
 	--with-guile						\
 %else
@@ -1596,7 +1596,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/stabs*
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-%if 0%{?rhel:1}
+%if 0%{?rhel:1}  && 0%{?rhel} <= 7
 # /usr/share/gdb/guile/ gets installed even --without-guile
 # https://sourceware.org/bugzilla/show_bug.cgi?id=17105
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gdb/guile
@@ -1715,6 +1715,9 @@ then
 fi
 
 %changelog
+* Tue Sep 26 2017 Troy Dawson <tdawson@redhat.com> - 8.0.1-27.fc28
+- Cleanup spec file conditionals
+
 * Tue Sep 12 2017 Jan Kratochvil <jan.kratochvil@redhat.com> - 8.0.1-26.fc26
 - Rebase to FSF GDB 8.0.1 (8.0 stable branch).