From 7676472f5e1919cec1cbecce4f75a396174fddc9 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Wed, 7 Jul 2021 13:14:57 +0200
Subject: [PATCH] Drop /afs from content subpackage list

Resolves: #1978587
---
 filesystem.spec | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/filesystem.spec b/filesystem.spec
index d809197..3436fa3 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
 Version: 3.14
-Release: 6%{?dist}
+Release: 8%{?dist}
 License: Public Domain
 URL: https://pagure.io/filesystem
 Group: System Environment/Base
@@ -48,7 +48,7 @@ install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed
 
 cd %{buildroot}
 
-mkdir -p afs boot dev \
+mkdir -p boot dev \
         etc/{X11/{applnk,fontpath.d,xinit/{xinitrc,xinput}.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},skel,sysconfig,pki,bash_completion.d,rwtab.d,statetab.d} \
         home media mnt opt root run srv tmp \
         usr/{bin,games,include,%{_lib}/{bpf,games,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \
@@ -130,6 +130,8 @@ mkdir -p %{buildroot}/usr/share/filesystem
 find %{buildroot} -mindepth 0 | sed -e 's|%{buildroot}|/|' -e 's|//|/|' \
  | LC_ALL=C sort | grep -v filesystem >%{buildroot}%{_datadir}/filesystem/paths
 
+mkdir -p afs
+
 %pretrans -p <lua>
 --# If we are running in pretrans in a fresh root, there is no /usr and
 --# symlinks. We cannot be sure, to be the very first rpm in the
@@ -160,8 +162,17 @@ posix.symlink("usr/%{_lib}", "/%{_lib}")
 posix.mkdir("/run")
 posix.mkdir("/proc")
 posix.mkdir("/sys")
-posix.chmod("/proc", 0555)
-posix.chmod("/sys", 0555)
+
+st = posix.stat("/proc")
+if st and st.mode ~= 0555 then
+  posix.chmod("/proc", 0555)
+end
+
+st = posix.stat("/sys")
+if st and st.mode ~= 0555 then
+  posix.chmod("/sys", 0555)
+end
+
 st = posix.stat("/media")
 if st and st.type == "link" then
   os.remove("/media")
@@ -313,6 +324,12 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /var/yp
 
 %changelog
+* Wed Jul  7 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.14-8
+- Drop /afs from -content
+
+* Mon Jun 21 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.14-7
+- Check mode before changing it
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.14-6
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937