From eda1ee8529d368a67c53395c3297e35397e35d0a1834b332fee0828e66d2df57 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 4 Sep 2023 11:56:31 +0000
Subject: [PATCH 1/3] Accepting request 1108855 from
 home:eeich:branches:science:HPC

- Make sure failure of last test in %posttrans is not returned as
  status of scriptlet (bsc#1214816).

OBS-URL: https://build.opensuse.org/request/show/1108855
OBS-URL: https://build.opensuse.org/package/show/science:HPC/gnu-compilers-hpc?expand=0&rev=47
---
 gnu-compilers-hpc.changes | 6 ++++++
 gnu-compilers-hpc.spec    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu-compilers-hpc.changes b/gnu-compilers-hpc.changes
index 41db995..3f215f0 100644
--- a/gnu-compilers-hpc.changes
+++ b/gnu-compilers-hpc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  4 11:39:42 UTC 2023 - Egbert Eich <eich@suse.com>
+
+- Make sure failure of last test in %posttrans is not returned as
+  status of scriptlet (bsc#1214816).
+
 -------------------------------------------------------------------
 Wed Jun 14 08:23:44 UTC 2023 - Egbert Eich <eich@suse.com>
 
diff --git a/gnu-compilers-hpc.spec b/gnu-compilers-hpc.spec
index 5ea11b2..c2d0ae9 100644
--- a/gnu-compilers-hpc.spec
+++ b/gnu-compilers-hpc.spec
@@ -251,7 +251,7 @@ do
 done
 for i in cc,gcc c++,g++; do
     test -e %{hpc_cf_install_path}/bin/${i##*,}%{hpc_gnu_bin_version} \
-	&& ln -s %{hpc_cf_install_path}/bin/${i%%%%,*} ${i##*,}%{hpc_gnu_bin_version}
+	&& ln -s %{hpc_cf_install_path}/bin/${i%%%%,*} ${i##*,}%{hpc_gnu_bin_version} || true
 done
 %else
 # for the base compiler version link to the 'default' binary:

From 8cce1857e4c44d06a3b8214e97a86dd2dc2967ff43ec944a3195114af5c2f16e Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 4 Sep 2023 13:40:12 +0000
Subject: [PATCH 2/3] Accepting request 1108891 from
 home:eeich:branches:science:HPC

- Crate correct links for cc and c++ and make sure failure of last
  test in %posttrans is not returned as status of scriptlet
  (bsc#1214816).

OBS-URL: https://build.opensuse.org/request/show/1108891
OBS-URL: https://build.opensuse.org/package/show/science:HPC/gnu-compilers-hpc?expand=0&rev=48
---
 gnu-compilers-hpc.changes | 5 +++--
 gnu-compilers-hpc.spec    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu-compilers-hpc.changes b/gnu-compilers-hpc.changes
index 3f215f0..5a04fde 100644
--- a/gnu-compilers-hpc.changes
+++ b/gnu-compilers-hpc.changes
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
 Mon Sep  4 11:39:42 UTC 2023 - Egbert Eich <eich@suse.com>
 
-- Make sure failure of last test in %posttrans is not returned as
-  status of scriptlet (bsc#1214816).
+- Crate correct links for cc and c++ and make sure failure of last
+  test in %posttrans is not returned as status of scriptlet
+  (bsc#1214816).
 
 -------------------------------------------------------------------
 Wed Jun 14 08:23:44 UTC 2023 - Egbert Eich <eich@suse.com>
diff --git a/gnu-compilers-hpc.spec b/gnu-compilers-hpc.spec
index c2d0ae9..a2dbef1 100644
--- a/gnu-compilers-hpc.spec
+++ b/gnu-compilers-hpc.spec
@@ -250,8 +250,8 @@ do
     esac
 done
 for i in cc,gcc c++,g++; do
-    test -e %{hpc_cf_install_path}/bin/${i##*,}%{hpc_gnu_bin_version} \
-	&& ln -s %{hpc_cf_install_path}/bin/${i%%%%,*} ${i##*,}%{hpc_gnu_bin_version} || true
+    test -e %{hpc_cf_install_path}/bin/${i##*,} \
+	&& ln -s ${i##*,} %{hpc_cf_install_path}/bin/${i%%%%,*} || true
 done
 %else
 # for the base compiler version link to the 'default' binary:

From 36fd409b0a70a6a2548a5b5f37e3f1e010850b39d33356a83530ffde7398693f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 4 Sep 2023 15:15:13 +0000
Subject: [PATCH 3/3] - Create correct links for cc and c++ and make sure
 failure of last

OBS-URL: https://build.opensuse.org/package/show/science:HPC/gnu-compilers-hpc?expand=0&rev=49
---
 gnu-compilers-hpc.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu-compilers-hpc.changes b/gnu-compilers-hpc.changes
index 5a04fde..1522851 100644
--- a/gnu-compilers-hpc.changes
+++ b/gnu-compilers-hpc.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Mon Sep  4 11:39:42 UTC 2023 - Egbert Eich <eich@suse.com>
 
-- Crate correct links for cc and c++ and make sure failure of last
+- Create correct links for cc and c++ and make sure failure of last
   test in %posttrans is not returned as status of scriptlet
   (bsc#1214816).