From 3cc73cfb1ddd4a701e9d5e48367e966ec922a474 Mon Sep 17 00:00:00 2001
From: WernerFink <>
Date: Jan 11 2023 13:38:03 +0000
Subject: Update bash to version 5.2.MACRO / rev 187 via SR 1057035


https://build.opensuse.org/request/show/1057035
by user WernerFink + dimstar_suse
- Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1051448 from lnussel)

---

diff --git a/.files b/.files
index b67e779..2de4371 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index b63ac0c..442adc6 100644
--- a/.rev
+++ b/.rev
@@ -1901,4 +1901,12 @@ Upstream declares the bash license to be GPL-3.0+ - not GPL-2.0+ (forwarded requ
     be optimized.</comment>
     <requestid>1043053</requestid>
   </revision>
+  <revision rev="187" vrev="8">
+    <srcmd5>a69d6f7a42754b16cf813d5870d3a7ce</srcmd5>
+    <version>5.2.MACRO</version>
+    <time>1673443965</time>
+    <user>dimstar_suse</user>
+    <comment>- Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1051448 from lnussel)</comment>
+    <requestid>1057035</requestid>
+  </revision>
 </revisionlist>
diff --git a/bash.changes b/bash.changes
index a9863a1..6d7113b 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Dec 27 10:23:00 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
+-------------------------------------------------------------------
 Wed Dec 14 14:52:27 UTC 2022 - Dr. Werner Fink <werner@suse.de>
 
 - Add upstream patches
diff --git a/bash.spec b/bash.spec
index a36f720..676ba75 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bash
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -219,7 +219,7 @@ unlink	      Remove a directory entry.
 
 whoami	      Print out username of current user.
 
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 %package legacybin
 Summary:        Legacy usrmove helper files
 Group:          System/Shells
@@ -586,7 +586,7 @@ fi
 %ghost %config %{_sysconfdir}/alternatives/sh
 %endif
 %dir %{_sysconfdir}/bash_completion.d
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/bash
 %if %{with alternatives}
 /bin/sh
@@ -608,7 +608,7 @@ fi
 
 %if %{without alternatives}
 %files sh
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/sh
 %endif
 %{_bindir}/sh
@@ -633,7 +633,7 @@ fi
 %files loadables
 %{_ldldir}
 
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 %files legacybin
 /bin/bash
 /bin/sh