diff --git a/gcc.spec.in b/gcc.spec.in index e81b141..faaaa4e 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -2542,6 +2542,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %defattr(-,root,root) %dir %{libsubdir}/plugin %{libsubdir}/plugin +%if %{build_m2} +%exclude %{libsubdir}/plugin/m2rte.so +%endif %endif %files locale -f gcc@base_ver@-locale.lang @@ -3061,6 +3064,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %defattr(-,root,root) %{_prefix}/bin/gm2%{binsuffix} %{libsubdir}/cc1gm2 +%if %{enable_plugins} +%{libsubdir}/plugin/m2rte.so +%endif %{versmainlibdir}/m2 %versmainlib libm2log.a %versmainlib libm2log.so diff --git a/gcc13.changes b/gcc13.changes index c3d95b9..4a13786 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 18 14:14:46 UTC 2024 - Richard Biener + +- Package m2rte.so plugin in the gcc13-m2 sub-package rather than + in gcc13-devel. [boo#1210959] + ------------------------------------------------------------------- Tue Jan 9 14:20:57 UTC 2024 - Richard Biener diff --git a/gcc13.spec b/gcc13.spec index fc70fd0..a210ac0 100644 --- a/gcc13.spec +++ b/gcc13.spec @@ -3542,6 +3542,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc13-locale.lang %defattr(-,root,root) %dir %{libsubdir}/plugin %{libsubdir}/plugin +%if %{build_m2} +%exclude %{libsubdir}/plugin/m2rte.so +%endif %endif %files locale -f gcc13-locale.lang @@ -4049,6 +4052,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc13-locale.lang %defattr(-,root,root) %{_prefix}/bin/gm2%{binsuffix} %{libsubdir}/cc1gm2 +%if %{enable_plugins} +%{libsubdir}/plugin/m2rte.so +%endif %{versmainlibdir}/m2 %versmainlib libm2log.a %versmainlib libm2log.so