From f3ec60f25a19b6c6af7f9a46e5e3bf70c99a8963 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 2 Mar 2022 14:22:23 +0000 Subject: [PATCH] - Drop unconditional -gccN suffix from libstdc++6-pp packages and instead use the same suffix as for the matching libstdc++6 package it supplements to ease future updates. Add Obsoletes to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow updates to happen. [bsc#1196107] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc12?expand=0&rev=20 --- cross-aarch64-gcc12-bootstrap.changes | 9 +++++ cross-aarch64-gcc12.changes | 9 +++++ cross-amdgcn-gcc12.changes | 9 +++++ cross-arm-gcc12.changes | 9 +++++ cross-arm-none-gcc12-bootstrap.changes | 9 +++++ cross-arm-none-gcc12.changes | 9 +++++ cross-avr-gcc12-bootstrap.changes | 9 +++++ cross-avr-gcc12.changes | 9 +++++ cross-epiphany-gcc12-bootstrap.changes | 9 +++++ cross-epiphany-gcc12.changes | 9 +++++ cross-hppa-gcc12.changes | 9 +++++ cross-m68k-gcc12.changes | 9 +++++ cross-mips-gcc12.changes | 9 +++++ cross-nvptx-gcc12.changes | 9 +++++ cross-ppc64-gcc12.changes | 9 +++++ cross-ppc64le-gcc12.changes | 9 +++++ cross-riscv64-elf-gcc12-bootstrap.changes | 9 +++++ cross-riscv64-elf-gcc12.changes | 9 +++++ cross-riscv64-gcc12-bootstrap.changes | 9 +++++ cross-riscv64-gcc12.changes | 9 +++++ cross-rx-gcc12-bootstrap.changes | 9 +++++ cross-rx-gcc12.changes | 9 +++++ cross-s390x-gcc12.changes | 9 +++++ cross-sparc-gcc12.changes | 9 +++++ cross-sparc64-gcc12.changes | 9 +++++ cross-x86_64-gcc12.changes | 9 +++++ gcc.spec.in | 17 ++++++--- gcc12-testresults.changes | 9 +++++ gcc12.changes | 9 +++++ gcc12.spec | 43 +++++++++++++++++------ 30 files changed, 296 insertions(+), 16 deletions(-) diff --git a/cross-aarch64-gcc12-bootstrap.changes b/cross-aarch64-gcc12-bootstrap.changes index 6550787..d09a497 100644 --- a/cross-aarch64-gcc12-bootstrap.changes +++ b/cross-aarch64-gcc12-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-aarch64-gcc12.changes b/cross-aarch64-gcc12.changes index 6550787..d09a497 100644 --- a/cross-aarch64-gcc12.changes +++ b/cross-aarch64-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-amdgcn-gcc12.changes b/cross-amdgcn-gcc12.changes index 6550787..d09a497 100644 --- a/cross-amdgcn-gcc12.changes +++ b/cross-amdgcn-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-arm-gcc12.changes b/cross-arm-gcc12.changes index 6550787..d09a497 100644 --- a/cross-arm-gcc12.changes +++ b/cross-arm-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-arm-none-gcc12-bootstrap.changes b/cross-arm-none-gcc12-bootstrap.changes index 6550787..d09a497 100644 --- a/cross-arm-none-gcc12-bootstrap.changes +++ b/cross-arm-none-gcc12-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-arm-none-gcc12.changes b/cross-arm-none-gcc12.changes index 6550787..d09a497 100644 --- a/cross-arm-none-gcc12.changes +++ b/cross-arm-none-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-avr-gcc12-bootstrap.changes b/cross-avr-gcc12-bootstrap.changes index 6550787..d09a497 100644 --- a/cross-avr-gcc12-bootstrap.changes +++ b/cross-avr-gcc12-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-avr-gcc12.changes b/cross-avr-gcc12.changes index 6550787..d09a497 100644 --- a/cross-avr-gcc12.changes +++ b/cross-avr-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-epiphany-gcc12-bootstrap.changes b/cross-epiphany-gcc12-bootstrap.changes index 6550787..d09a497 100644 --- a/cross-epiphany-gcc12-bootstrap.changes +++ b/cross-epiphany-gcc12-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-epiphany-gcc12.changes b/cross-epiphany-gcc12.changes index 6550787..d09a497 100644 --- a/cross-epiphany-gcc12.changes +++ b/cross-epiphany-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-hppa-gcc12.changes b/cross-hppa-gcc12.changes index 6550787..d09a497 100644 --- a/cross-hppa-gcc12.changes +++ b/cross-hppa-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-m68k-gcc12.changes b/cross-m68k-gcc12.changes index 6550787..d09a497 100644 --- a/cross-m68k-gcc12.changes +++ b/cross-m68k-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-mips-gcc12.changes b/cross-mips-gcc12.changes index 6550787..d09a497 100644 --- a/cross-mips-gcc12.changes +++ b/cross-mips-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-nvptx-gcc12.changes b/cross-nvptx-gcc12.changes index 6550787..d09a497 100644 --- a/cross-nvptx-gcc12.changes +++ b/cross-nvptx-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-ppc64-gcc12.changes b/cross-ppc64-gcc12.changes index 6550787..d09a497 100644 --- a/cross-ppc64-gcc12.changes +++ b/cross-ppc64-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-ppc64le-gcc12.changes b/cross-ppc64le-gcc12.changes index 6550787..d09a497 100644 --- a/cross-ppc64le-gcc12.changes +++ b/cross-ppc64le-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-riscv64-elf-gcc12-bootstrap.changes b/cross-riscv64-elf-gcc12-bootstrap.changes index 6550787..d09a497 100644 --- a/cross-riscv64-elf-gcc12-bootstrap.changes +++ b/cross-riscv64-elf-gcc12-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-riscv64-elf-gcc12.changes b/cross-riscv64-elf-gcc12.changes index 6550787..d09a497 100644 --- a/cross-riscv64-elf-gcc12.changes +++ b/cross-riscv64-elf-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-riscv64-gcc12-bootstrap.changes b/cross-riscv64-gcc12-bootstrap.changes index 6550787..d09a497 100644 --- a/cross-riscv64-gcc12-bootstrap.changes +++ b/cross-riscv64-gcc12-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-riscv64-gcc12.changes b/cross-riscv64-gcc12.changes index 6550787..d09a497 100644 --- a/cross-riscv64-gcc12.changes +++ b/cross-riscv64-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-rx-gcc12-bootstrap.changes b/cross-rx-gcc12-bootstrap.changes index 6550787..d09a497 100644 --- a/cross-rx-gcc12-bootstrap.changes +++ b/cross-rx-gcc12-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-rx-gcc12.changes b/cross-rx-gcc12.changes index 6550787..d09a497 100644 --- a/cross-rx-gcc12.changes +++ b/cross-rx-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-s390x-gcc12.changes b/cross-s390x-gcc12.changes index 6550787..d09a497 100644 --- a/cross-s390x-gcc12.changes +++ b/cross-s390x-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-sparc-gcc12.changes b/cross-sparc-gcc12.changes index 6550787..d09a497 100644 --- a/cross-sparc-gcc12.changes +++ b/cross-sparc-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-sparc64-gcc12.changes b/cross-sparc64-gcc12.changes index 6550787..d09a497 100644 --- a/cross-sparc64-gcc12.changes +++ b/cross-sparc64-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/cross-x86_64-gcc12.changes b/cross-x86_64-gcc12.changes index 6550787..d09a497 100644 --- a/cross-x86_64-gcc12.changes +++ b/cross-x86_64-gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/gcc.spec.in b/gcc.spec.in index ab970d9..66acf75 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -524,12 +524,19 @@ library. It is needed for compiling C++ code. # PACKAGE-END # PACKAGE-BEGIN -%package -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}@variant@ +%package -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}@variant@ Summary: GDB pretty printers for the C++ standard library License: GPL-3.0-or-later Group: Development/Languages/C and C++ -Requires: libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} = %{version}-%{release} +# The -pp packages are tied to a specific shared library +Requires: libstdc++%{libstdcxx_sover}@variant@ = %{version}-%{release} +Requires: libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} = %{version}-%{release} Provides: libstdc++%{libstdcxx_sover}-pp@variant@ = %{version}-%{release} +# To allow updates from libstdc++6-pp-gccM to libstdc++6-pp we need +# enumerates Obsoletes, the separate -pp package was introduced with GCC9 +# and dropped somewhen during the GCC11 to GCC12 transition +Obsoletes: libstdc++6-pp-gcc9@variant@ libstdc++6-pp-gcc10@variant@ +Obsoletes: libstdc++6-pp-gcc11@variant@ # Only one package may provide this - allows multiple gcc versions # to co-exist without an overly large list of provides/obsoletes Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp@variant@ @@ -539,7 +546,7 @@ Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp@variant@ Supplements: (gdb and libstdc++%{libstdcxx_sover}@variant@ = %{version}-%{release}) %endif -%description -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}@variant@ +%description -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}@variant@ This package contains pretty printers for the C++ standard library usable from GDB. # PACKAGE-END @@ -2367,7 +2374,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %versmainlib libsupc++.a %{_prefix}/include/c++ -%files -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} +%files -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} %defattr(-,root,root) %dir %{_datadir}/gdb %dir %{_datadir}/gdb/auto-load @@ -2384,7 +2391,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %versbiarchlib libstdc++.so %versbiarchlib libsupc++.a -%files -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}%{separate_biarch_suffix} +%files -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}%{separate_biarch_suffix} %defattr(-,root,root) %dir %{_datadir}/gdb/auto-load/%{mainlibdirbi} %{_datadir}/gdb/auto-load/%{mainlibdirbi}/libstdc++.so.*-gdb.py diff --git a/gcc12-testresults.changes b/gcc12-testresults.changes index 6550787..d09a497 100644 --- a/gcc12-testresults.changes +++ b/gcc12-testresults.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/gcc12.changes b/gcc12.changes index 6550787..d09a497 100644 --- a/gcc12.changes +++ b/gcc12.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:45 UTC 2022 - Richard Biener + +- Drop unconditional -gccN suffix from libstdc++6-pp packages and + instead use the same suffix as for the matching libstdc++6 + package it supplements to ease future updates. Add Obsoletes + to pre-existing libstdc++6-pp-gcc{9,10,11} packages to allow + updates to happen. [bsc#1196107] + ------------------------------------------------------------------- Tue Mar 1 19:34:43 UTC 2022 - Martin Liška diff --git a/gcc12.spec b/gcc12.spec index f08d199..841d224 100644 --- a/gcc12.spec +++ b/gcc12.spec @@ -555,12 +555,19 @@ Requires: libunwind-devel This package contains all the headers and libraries of the standard C++ library. It is needed for compiling C++ code. -%package -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} +%package -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} Summary: GDB pretty printers for the C++ standard library License: GPL-3.0-or-later Group: Development/Languages/C and C++ -Requires: libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} = %{version}-%{release} +# The -pp packages are tied to a specific shared library +Requires: libstdc++%{libstdcxx_sover} = %{version}-%{release} +Requires: libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} = %{version}-%{release} Provides: libstdc++%{libstdcxx_sover}-pp = %{version}-%{release} +# To allow updates from libstdc++6-pp-gccM to libstdc++6-pp we need +# enumerates Obsoletes, the separate -pp package was introduced with GCC9 +# and dropped somewhen during the GCC11 to GCC12 transition +Obsoletes: libstdc++6-pp-gcc9 libstdc++6-pp-gcc10 +Obsoletes: libstdc++6-pp-gcc11 # Only one package may provide this - allows multiple gcc versions # to co-exist without an overly large list of provides/obsoletes Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp @@ -570,16 +577,23 @@ Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp Supplements: (gdb and libstdc++%{libstdcxx_sover} = %{version}-%{release}) %endif -%description -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} +%description -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} This package contains pretty printers for the C++ standard library usable from GDB. -%package -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}-32bit +%package -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}-32bit Summary: GDB pretty printers for the C++ standard library License: GPL-3.0-or-later Group: Development/Languages/C and C++ -Requires: libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} = %{version}-%{release} +# The -pp packages are tied to a specific shared library +Requires: libstdc++%{libstdcxx_sover}-32bit = %{version}-%{release} +Requires: libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} = %{version}-%{release} Provides: libstdc++%{libstdcxx_sover}-pp-32bit = %{version}-%{release} +# To allow updates from libstdc++6-pp-gccM to libstdc++6-pp we need +# enumerates Obsoletes, the separate -pp package was introduced with GCC9 +# and dropped somewhen during the GCC11 to GCC12 transition +Obsoletes: libstdc++6-pp-gcc9-32bit libstdc++6-pp-gcc10-32bit +Obsoletes: libstdc++6-pp-gcc11-32bit # Only one package may provide this - allows multiple gcc versions # to co-exist without an overly large list of provides/obsoletes Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp-32bit @@ -589,16 +603,23 @@ Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp-32bit Supplements: (gdb and libstdc++%{libstdcxx_sover}-32bit = %{version}-%{release}) %endif -%description -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}-32bit +%description -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}-32bit This package contains pretty printers for the C++ standard library usable from GDB. -%package -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}-64bit +%package -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}-64bit Summary: GDB pretty printers for the C++ standard library License: GPL-3.0-or-later Group: Development/Languages/C and C++ -Requires: libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} = %{version}-%{release} +# The -pp packages are tied to a specific shared library +Requires: libstdc++%{libstdcxx_sover}-64bit = %{version}-%{release} +Requires: libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} = %{version}-%{release} Provides: libstdc++%{libstdcxx_sover}-pp-64bit = %{version}-%{release} +# To allow updates from libstdc++6-pp-gccM to libstdc++6-pp we need +# enumerates Obsoletes, the separate -pp package was introduced with GCC9 +# and dropped somewhen during the GCC11 to GCC12 transition +Obsoletes: libstdc++6-pp-gcc9-64bit libstdc++6-pp-gcc10-64bit +Obsoletes: libstdc++6-pp-gcc11-64bit # Only one package may provide this - allows multiple gcc versions # to co-exist without an overly large list of provides/obsoletes Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp-64bit @@ -608,7 +629,7 @@ Conflicts: %selfconflict libstdc++%{libstdcxx_sover}-pp-64bit Supplements: (gdb and libstdc++%{libstdcxx_sover}-64bit = %{version}-%{release}) %endif -%description -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}-64bit +%description -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}-64bit This package contains pretty printers for the C++ standard library usable from GDB. @@ -3154,7 +3175,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc12-locale.lang %versmainlib libsupc++.a %{_prefix}/include/c++ -%files -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix} +%files -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix} %defattr(-,root,root) %dir %{_datadir}/gdb %dir %{_datadir}/gdb/auto-load @@ -3171,7 +3192,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc12-locale.lang %versbiarchlib libstdc++.so %versbiarchlib libsupc++.a -%files -n libstdc++%{libstdcxx_sover}-pp%{libdevel_suffix}%{separate_biarch_suffix} +%files -n libstdc++%{libstdcxx_sover}-pp%{libstdcxx_suffix}%{separate_biarch_suffix} %defattr(-,root,root) %dir %{_datadir}/gdb/auto-load/%{mainlibdirbi} %{_datadir}/gdb/auto-load/%{mainlibdirbi}/libstdc++.so.*-gdb.py