From 1868e87b52baad0eda0ce38b8957b2287b6bb6a977167ae10ea15650eda022dd Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Thu, 26 Aug 2021 09:10:49 +0000
Subject: [PATCH] osc copypac from project:Base:System package:filesystem
 revision:211

OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=213
---
 filesystem.changes |  6 ------
 filesystem.links   |  2 +-
 filesystem.spec    | 17 +++++++++--------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/filesystem.changes b/filesystem.changes
index 9d2174e..f3db083 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Mon Aug 23 11:49:33 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
-
-- use %ghost for /bin, /sbin, /lib and /lib64 to avoid file conflict
-  with pre-usrmerge filesystem package (boo#1188847).
-
 -------------------------------------------------------------------
 Mon Aug  2 07:55:40 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/filesystem.links b/filesystem.links
index fc09b0d..4cf1248 100644
--- a/filesystem.links
+++ b/filesystem.links
@@ -2,4 +2,4 @@
 # Required for FHS 2.1
 spool/mail		/var/mail
 # systemd
-../run                  /var/run  %ghost
+../run                  /var/run
diff --git a/filesystem.spec b/filesystem.spec
index 27d15b1..05d83c9 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -161,11 +161,11 @@ echo "%%defattr(-,root,root)" > filesystem.list
 cat %{SOURCE64} >> directory.list
 %endif
 cat >> filesystem.links << EOF
-usr/bin   /bin %%ghost
-usr/sbin  /sbin %%ghost
-usr/lib   /lib %%ghost
+usr/bin   /bin
+usr/sbin  /sbin
+usr/lib   /lib
 %ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64
-usr/lib64 /lib64 %%ghost
+usr/lib64 /lib64
 %endif
 EOF
 cat >> directory.list <<EOF
@@ -176,9 +176,9 @@ while read MOD OWN GRP NAME ; do
     create_dir $MOD $OWN $GRP $NAME
 done < directory.list
 # ghost files next
-while read MOD OWN GRP NAME ; do
+cat ghost.list | while read MOD OWN GRP NAME ; do
     create_dir $MOD $OWN $GRP $NAME "%%ghost "
-done < ghost.list
+done
 # arch specific leftovers
 for march in \
 %ifarch %ix86
@@ -216,7 +216,7 @@ done
 create_dir 0755 root root /emul/ia32-linux
 %endif
 # now do the links
-while read SRC DEST ATTR ; do
+while read SRC DEST ; do
 case $SRC in
  "") continue ;;
  \#*) echo "comment: $SRC $DEST" ;;
@@ -229,7 +229,8 @@ case $SRC in
     esac
     ln -sf $SRC $RPM_BUILD_ROOT$DEST
     case $DEST in
-	*) echo "$ATTR${ATTR:+ }$DEST" >> filesystem.list ;;
+	/var/run|/var/lock) echo "%ghost $DEST" >> filesystem.list ;;
+	*) echo "$DEST" >> filesystem.list ;;
     esac
     # for tmpfiles.d
     case  $DEST in