From e89494725c5684bcb8b9feb8f97d67e694405c5e71706acf13696b4d972972a5 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Wed, 29 Sep 2021 13:07:59 +0000
Subject: [PATCH 1/2] - Move /lib/cpp to /usr/lib/cpp for the usr merge. 
 [bsc#1191060]

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=111
---
 gcc.changes |  5 +++++
 gcc.spec    | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/gcc.changes b/gcc.changes
index 9ee4b5b..5f8a2cd 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 29 13:02:30 UTC 2021 - Richard Biener <rguenther@suse.com>
+
+- Move /lib/cpp to /usr/lib/cpp for the usr merge.  [bsc#1191060]
+
 -------------------------------------------------------------------
 Fri Aug 27 17:41:23 UTC 2021 - Andreas Schwab <schwab@suse.de>
 
diff --git a/gcc.spec b/gcc.spec
index 4f5efa6..1583f92 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -446,9 +446,15 @@ done
 for info in cpp gcc gfortran ; do
   ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz
 done
-# Provide the traditional /lib/cpp that only handles C
+# Provide the traditional /usr/lib/cpp that only handles C
+%if !0%{?usrmerged}
 cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT/lib/
 chmod 755 $RPM_BUILD_ROOT/lib/cpp
+%else
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
+cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT%{_prefix}/lib/
+chmod 755 $RPM_BUILD_ROOT%{_prefix}/lib/cpp
+%endif
 # Provide extra symlinks
 ln -sf g++-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/c++
 ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc
@@ -500,7 +506,11 @@ fi
 
 %files -n cpp
 %defattr(-,root,root)
+%if !0%{?usrmerged}
 /lib/cpp
+%else
+%{_prefix}/lib/cpp
+%endif
 %{_prefix}/bin/cpp
 %doc %{_mandir}/man1/cpp.1.gz
 

From a9819cffb1cdb518bc262735f7640b7963449563c24dad6cf4d388b24d4f36b0 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Wed, 29 Sep 2021 13:53:39 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=112

---
 gcc.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gcc.spec b/gcc.spec
index 1583f92..a69f456 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -446,8 +446,9 @@ done
 for info in cpp gcc gfortran ; do
   ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz
 done
-# Provide the traditional /usr/lib/cpp that only handles C
-%if !0%{?usrmerged}
+# Provide the traditional /lib/cpp (as /usr/lib/cpp on usrmerged systems)
+# that only handles C
+%if 0%{?suse_version} < 1550
 cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT/lib/
 chmod 755 $RPM_BUILD_ROOT/lib/cpp
 %else
@@ -506,7 +507,7 @@ fi
 
 %files -n cpp
 %defattr(-,root,root)
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /lib/cpp
 %else
 %{_prefix}/lib/cpp