.spec cleanup: Drop SCL obsoletes of devtoolset-1.1*: *-1.0*

This commit is contained in:
Jan Kratochvil 2016-03-18 20:12:14 +01:00
parent 04d3aefc17
commit 4dd46aad51

View File

@ -27,7 +27,7 @@ Version: 7.11
# The release always contains a leading reserved number, start it at 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. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 61%{?dist} Release: 62%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL 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 Group: Development/Debuggers
@ -37,10 +37,6 @@ Source: ftp://sourceware.org/pub/gdb/releases/%{tarname}.tar.xz
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
URL: http://gnu.org/software/gdb/ URL: http://gnu.org/software/gdb/
%if "%{scl}" == "devtoolset-1.1"
Obsoletes: devtoolset-1.0-%{pkg_name}
%endif
# For our convenience # For our convenience
%global gdb_src %{tarname} %global gdb_src %{tarname}
%global gdb_build build-%{_target_platform} %global gdb_build build-%{_target_platform}
@ -705,10 +701,6 @@ and printing their data.
Summary: A standalone server for GDB (the GNU source-level debugger) Summary: A standalone server for GDB (the GNU source-level debugger)
Group: Development/Debuggers Group: Development/Debuggers
%if "%{scl}" == "devtoolset-1.1"
Obsoletes: devtoolset-1.0-%{pkg_name}-gdbserver
%endif
%description gdbserver %description gdbserver
GDB, the GNU debugger, allows you to debug programs written in C, C++, GDB, the GNU debugger, allows you to debug programs written in C, C++,
Java, and other languages, by executing them in a controlled fashion Java, and other languages, by executing them in a controlled fashion
@ -725,10 +717,6 @@ BuildArch: noarch
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
%if "%{scl}" == "devtoolset-1.1"
Obsoletes: devtoolset-1.0-%{pkg_name}-doc
%endif
%description doc %description doc
GDB, the GNU debugger, allows you to debug programs written in C, C++, GDB, the GNU debugger, allows you to debug programs written in C, C++,
Java, and other languages, by executing them in a controlled fashion Java, and other languages, by executing them in a controlled fashion
@ -1393,6 +1381,9 @@ then
fi fi
%changelog %changelog
* Fri Mar 18 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11-62.fc24
- .spec cleanup: Drop SCL obsoletes of devtoolset-1.1*: *-1.0*
* Thu Mar 17 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11-61.fc24 * Thu Mar 17 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11-61.fc24
- Add message suggesting gdbserver for non-matching PID namespaces. - Add message suggesting gdbserver for non-matching PID namespaces.