diff --git a/gcc.spec.in b/gcc.spec.in index 86659a0..1081ec7 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -534,8 +534,10 @@ 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-gcc9@variant@ libstdc++6-pp-gcc10@variant@ Obsoletes: libstdc++6-pp-gcc11@variant@ +Provides: libstdc++6-pp-gcc9@variant@ libstdc++6-pp-gcc10@variant@ +Provides: 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@ diff --git a/gcc12.changes b/gcc12.changes index b6de690..082772a 100644 --- a/gcc12.changes +++ b/gcc12.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 26 06:46:45 UTC 2022 - Richard Biener + +- Add Provides of libstdc++6-pp-gccN to libstdc++6-pp. [bsc#1201848] + ------------------------------------------------------------------- Thu Jul 21 13:43:06 UTC 2022 - Richard Biener diff --git a/gcc12.spec b/gcc12.spec index 9f02bb9..4439779 100644 --- a/gcc12.spec +++ b/gcc12.spec @@ -567,6 +567,9 @@ Provides: libstdc++%{libstdcxx_sover}-pp = %{version}-%{release} # and dropped somewhen during the GCC11 to GCC12 transition Obsoletes: libstdc++6-pp-gcc9 libstdc++6-pp-gcc10 Obsoletes: libstdc++6-pp-gcc11 +Provides: libstdc++6-pp-gcc10 +Provides: libstdc++6-pp-gcc11 +Provides: libstdc++6-pp-gcc9 # 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 @@ -593,6 +596,9 @@ Provides: libstdc++%{libstdcxx_sover}-pp-32bit = %{version}-%{release} # 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 +Provides: libstdc++6-pp-gcc10-32bit +Provides: libstdc++6-pp-gcc11-32bit +Provides: libstdc++6-pp-gcc9-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 @@ -619,6 +625,9 @@ Provides: libstdc++%{libstdcxx_sover}-pp-64bit = %{version}-%{release} # 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 +Provides: libstdc++6-pp-gcc10-64bit +Provides: libstdc++6-pp-gcc11-64bit +Provides: libstdc++6-pp-gcc9-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