From 73b0bc57c8ec8b5abcbf258d3dab097b8bdfa8a0567f649f866339b92cfe9bd9 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Wed, 16 Jun 2021 14:37:05 +0000
Subject: [PATCH] Accepting request 900350 from home:lnussel:usrmove

- Enable usrmerge in Factory always as it's default there
- Add conflict with pre-usrmerge filesystem package

OBS-URL: https://build.opensuse.org/request/show/900350
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=599
---
 glibc.changes | 6 ++++++
 glibc.spec    | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/glibc.changes b/glibc.changes
index 8020e50..2f6cd56 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 11 11:42:10 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
+
+- Enable usrmerge in Factory always as it's default there
+- Add conflict with pre-usrmerge filesystem package
+
 -------------------------------------------------------------------
 Thu Jun 10 13:24:39 UTC 2021 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index 82d109f..5bda0ed 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -25,7 +25,7 @@
 
 %define flavor @BUILD_FLAVOR@%{nil}
 
-%if 0%{?usrmerged}
+%if 0%{?usrmerged} || 0%{?suse_version} >= 1550
 %bcond_without usrmerged
 %else
 %bcond_with usrmerged
@@ -165,6 +165,10 @@ Obsoletes:      ngpt-devel < 2.2.2
 Provides:       ngpt = 2.2.2
 Provides:       ngpt-devel = 2.2.2
 Conflicts:      kernel < %{enablekernel}
+%if %{with usrmerged}
+# make sure we have post-usrmerge filesystem package
+Conflicts:      filesystem < 15.6
+%endif
 # bug437293 - handle update from SLES10 on PowerPC
 %ifarch ppc64
 Obsoletes:      glibc-64bit