From 3b3c59425caa7ef4e1463f366fff86a1035d87b81d71c1bf1acb68eb76a9be17 Mon Sep 17 00:00:00 2001
From: Michael Matz <matz@suse.com>
Date: Fri, 26 Jul 2019 12:04:33 +0000
Subject: [PATCH] Accepting request 718654 from
 home:StefanBruens:branches:devel:gcc

- Remove some conditionals for SLE-10 (build is disabled/unresolvable).
- BuildRequire makeinfo instead of full texinfo (requiring texlive)
  where available (SLE >= 12).

OBS-URL: https://build.opensuse.org/request/show/718654
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=217
---
 gdb.changes |  7 +++++++
 gdb.spec    | 33 +++++++--------------------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/gdb.changes b/gdb.changes
index 972f8a8..899574a 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 25 21:46:56 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Remove some conditionals for SLE-10 (build is disabled/unresolvable).
+- BuildRequire makeinfo instead of full texinfo (requiring texlive)
+  where available (SLE >= 12).
+
 -------------------------------------------------------------------
 Mon Jul 22 16:58:16 UTC 2019 - Tom de Vries <tdevries@suse.de>
 
diff --git a/gdb.spec b/gdb.spec
index 4ced2b7..ca89241 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -258,23 +258,21 @@ BuildRequires:  glibc-devel
 # support for newer distro versions in anticipation of a move to guile 2.2.
 BuildRequires:  guile-devel
 %endif
-BuildRequires:  ncurses-devel
-BuildRequires:  texinfo
-%if %{suse_version} < 1020
-BuildRequires:  expat
-%else
 BuildRequires:  libexpat-devel
+%if 0%{suse_version} >= 1200
+BuildRequires:  makeinfo
+%else
+BuildRequires:  texinfo
 %endif
 BuildRequires:  mpfr-devel
+BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
 BuildRequires:  rpm-devel
-BuildRequires:  zlib-devel
 BuildRequires:  xz-devel
+BuildRequires:  zlib-devel
 %if 0%{!?_without_python:1}
-%if 0%{suse_version} > 1000
 Requires:       %{python}-base
-%endif
 BuildRequires:  %{python}-devel
 %endif	# 0%{!?_without_python:1}
 
@@ -306,7 +304,6 @@ ExclusiveArch:  noarch i386 x86_64 ppc ppc64 ia64 s390 s390x
 %define ada_arch %ix86 x86_64 ppc s390 ia64
 %endif
 
-
 # Ensure the devel libraries are installed for both multilib arches.
 %global bits_local %{?_isa}
 %global bits_other %{?_isa}
@@ -383,7 +380,6 @@ Java, and other languages, by executing them in a controlled fashion
 and printing their data.
 
 %ifnarch riscv64
-%if %{suse_version} > 1010
 %package -n gdbserver
 Summary:        A standalone server for GDB (the GNU source-level debugger)
 License:        GPL-3.0-or-later AND GPL-3.0-with-GCC-exception AND LGPL-2.1-or-later AND LGPL-3.0-or-later
@@ -397,7 +393,6 @@ and printing their data.
 This package provides a program that allows you to run GDB on a different
 machine than the one which is running the program being debugged.
 %endif
-%endif
 
 %package doc
 Summary:        Documentation for GDB (the GNU source-level debugger)
@@ -1084,16 +1079,6 @@ fi
 %{_datadir}/gdb
 %{_infodir}/annotate.info*
 %{_infodir}/gdb.info*
-%ifnarch riscv64
-# In SLE10 gdbserver is not in a separate package
-%if %{suse_version} <= 1010
-%{_bindir}/gdbserver
-%{_mandir}/*/gdbserver.1*
-%ifnarch s390 s390x ia64 ppc %{sparc}
-%{_libdir}/libinproctrace.so
-%endif
-%endif
-%endif
 
 %if %{with testsuite}
 %files testresults
@@ -1104,9 +1089,7 @@ fi
 
 # don't include the files in include, they are part of binutils
 
-%ifnarch riscv64
-%if %{suse_version} > 1010
-%ifnarch sparcv9 hppa
+%ifnarch riscv64 sparcv9 hppa
 %files -n gdbserver
 %defattr(-,root,root)
 %{_bindir}/gdbserver
@@ -1115,8 +1098,6 @@ fi
 %{_libdir}/libinproctrace.so
 %endif # %%{have_inproctrace}
 %endif
-%endif
-%endif
 
 %post doc
 # This step is part of the installation of the RPM. Not to be confused