[rpms/gdb] gdb-17.2-rebase-f44: Simplify .spec: Remove conditional revert of: gdb-dts-rhel6-python-compat.patch

[rpms/gdb] gdb-17.2-rebase-f44: Simplify .spec: Remove conditional revert of: gdb-dts-rhel6-python-compat.patch

[Jan Kratochvil]

A new commit has been pushed.

Repo   : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : a4961b91905ad22697b91fd80d9e479fd91d203d
Author : Jan Kratochvil <jan.kratochvil@redhat.com>
Date   : 2016-01-09T14:38:42+01:00
Stats  : +12/-5 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/gdb/c/a4961b91905ad22697b91fd80d9e479fd91d203d?branch=gdb-17.2-rebase-f44

Log:
Simplify .spec: Remove conditional revert of: gdb-dts-rhel6-python-compat.patch

---
diff --git a/gdb.spec b/gdb.spec
index eaa16b2..c6aa789 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -27,7 +27,7 @@ Version: 7.10.50.%{snapsrc}
 
 # 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: 36%{?dist}
+Release: 37%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -878,11 +878,8 @@ find -name "*.info*"|xargs rm -f
 %patch1066 -p1
 %patch1067 -p1
 %patch1070 -p1
-
 %patch848 -p1
-%if 0%{!?el6:1}
-%patch848 -p1 -R
-%endif
+
 %patch833 -p1
 %if 0%{!?el6:1} || 0%{!?scl:1}
 %patch833 -p1 -R
@@ -1300,6 +1297,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/system-gdbinit/elinos.py
 rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/system-gdbinit/wrs-linux.py
 rmdir $RPM_BUILD_ROOT%{_datadir}/gdb/system-gdbinit
 
+# Patch848: gdb-dts-rhel6-python-compat.patch
+%if 0%{!?el6:1}
+rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/FrameWrapper.py
+rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/backtrace.py
+rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/command/backtrace.py
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1393,6 +1397,9 @@ then
 fi
 
 %changelog
+* Sat Jan  9 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.10.50.20160106-37.fc24
+- Simplify .spec: Remove conditional revert of: gdb-dts-rhel6-python-compat.patch
+
 * Sat Jan  9 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.10.50.20160106-36.fc24
 - VLA (Fortran dynamic arrays) strides (multi-dimensional subarrays) from Intel.