[rpms/gdb] gdb-17.2-rebase-f44: [devtoolset] Include Obsoletes of devtoolset-1.0-* by devtoolset-1.1-*.

[rpms/gdb] gdb-17.2-rebase-f44: [devtoolset] Include Obsoletes of devtoolset-1.0-* by devtoolset-1.1-*.

[Jan Kratochvil]

A new commit has been pushed.

Repo   : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : 536bc96db1a981b2cff89b05d9564f9de9658d63
Author : Jan Kratochvil <jan.kratochvil@redhat.com>
Date   : 2012-07-16T19:31:07+02:00
Stats  : +16/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/gdb/c/536bc96db1a981b2cff89b05d9564f9de9658d63?branch=gdb-17.2-rebase-f44

Log:
[devtoolset] Include Obsoletes of devtoolset-1.0-* by devtoolset-1.1-*.

---
diff --git a/gdb.spec b/gdb.spec
index f63ca8c..0ba8526 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -35,7 +35,7 @@ Version: 7.4.50.%{snap}
 
 # 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: 14%{?dist}
+Release: 15%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
 Group: Development/Debuggers
@@ -47,6 +47,10 @@ Source: ftp://sourceware.org/pub/gdb/snapshots/current/gdb-%{version}.tar.bz2
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://gnu.org/software/gdb/
 
+%if "%{scl}" == "devtoolset-1.1"
+Obsoletes: devtoolset-1.0-%{pkg_name}
+%endif
+
 # For our convenience
 %global gdb_src %{pkg_name}-%{version}
 %global gdb_build build-%{_target_platform}
@@ -701,6 +705,10 @@ and printing their data.
 Summary: A standalone server for GDB (the GNU source-level debugger)
 Group: Development/Debuggers
 
+%if "%{scl}" == "devtoolset-1.1"
+Obsoletes: devtoolset-1.0-%{pkg_name}-gdbserver
+%endif
+
 %description gdbserver
 GDB, the GNU debugger, allows you to debug programs written in C, C++,
 Java, and other languages, by executing them in a controlled fashion
@@ -722,6 +730,10 @@ Group: Documentation
 BuildArch: noarch
 %endif # 0%{!?el5:1}
 
+%if "%{scl}" == "devtoolset-1.1"
+Obsoletes: devtoolset-1.0-%{pkg_name}-doc
+%endif
+
 %description doc
 GDB, the GNU debugger, allows you to debug programs written in C, C++,
 Java, and other languages, by executing them in a controlled fashion
@@ -1354,6 +1366,9 @@ fi
 %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch"
 
 %changelog
+* Mon Jul 16 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120714-15.fc18
+- [devtoolset] Include Obsoletes of devtoolset-1.0-* by devtoolset-1.1-*.
+
 * Sun Jul 15 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120714-14.fc18
 - Rebase to FSF GDB 7.4.50.20120714.
   - Fix entryval feature crash on some .debug files optimized by dwz (BZ 839596).