From d0298195bffcba009eccb32b0f7c5adc13bbb635 Mon Sep 17 00:00:00 2001 From: Wenchao Hao Date: Wed, 17 Nov 2021 15:08:29 +0800 Subject: [PATCH] update to 3.16 version Signed-off-by: Wenchao Hao (cherry picked from commit a2a011b3e089f29c7fed2117160062478a886ea3) --- filesystem.spec | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index 87eb538..c962777 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -1,8 +1,7 @@ -#This spec file fetch from https://pagure.io/filesystem/blob/master/f/filesystem.spec Summary: The basic directory layout for a Linux system Name: filesystem -Version: 3.14 -Release: 2 +Version: 3.16 +Release: 1%{?dist} License: Public Domain URL: https://pagure.io/filesystem Group: System Environment/Base @@ -12,6 +11,9 @@ Source3: iso_3166.sed BuildRequires: iso-codes Requires(pre): setup +Provides: filesystem-afs = %{version}-%{release} +Obsoletes: filesystem-afs <= 3.14-2 + %description The filesystem package is one of the basic packages that is installed on a Linux system. Filesystem contains the basic directory layout @@ -27,15 +29,6 @@ This subpackage of filesystem package contains just the file with the directories owned by the filesystem package. This can be used during the build process instead of calling rpm -ql filesystem. -%package afs -Summary: AFS root directory from the filesystem package -License: Public Domain - -%description afs -This subpackage of filesystem package contains just the AFS filesystem -dynamic root directory. This can be used with packages that add an -AFS client. - %prep rm -f $RPM_BUILD_DIR/filelist @@ -51,7 +44,7 @@ cd %{buildroot} mkdir -p afs 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 proc root run srv sys tmp \ + 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} \ var/{adm,empty,ftp,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp} @@ -159,6 +152,10 @@ posix.symlink("../.dwz", "/usr/lib/debug/usr/.dwz") posix.symlink("usr/sbin", "/usr/lib/debug/sbin") 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("/media") if st and st.type == "link" then os.remove("/media") @@ -178,22 +175,20 @@ restorecon /sys 2>/dev/null >/dev/null || : restorecon /boot 2>/dev/null >/dev/null || : restorecon /dev 2>/dev/null >/dev/null || : restorecon /media 2>/dev/null >/dev/null || : - -%posttrans afs restorecon /afs 2>/dev/null >/dev/null || : %files content %dir %{_datadir}/filesystem %{_datadir}/filesystem/paths -%files afs -%attr(555,root,root) /afs + %files -f filelist %defattr(0755,root,root,0755) %dir %attr(555,root,root) / /bin %attr(555,root,root) /boot +%attr(555,root,root) /afs /dev %dir /etc /etc/X11 @@ -214,12 +209,12 @@ restorecon /afs 2>/dev/null >/dev/null || : /media %dir /mnt %dir /opt -%attr(555,root,root) /proc +%ghost %attr(555,root,root) /proc %attr(550,root,root) /root /run /sbin /srv -%attr(555,root,root) /sys +%ghost %attr(555,root,root) /sys %attr(1777,root,root) /tmp %dir /usr %attr(555,root,root) /usr/bin @@ -310,8 +305,18 @@ restorecon /afs 2>/dev/null >/dev/null || : /var/yp %changelog -* Fri Jul 17 2020 Ruijun Ge - 3.14-2 -- update to 3.14 version +* Wed Nov 17 2021 Wenchao Hao 3.16-1 +- update to 3.16 version + +* Tue Aug 3 2021 Pavel Zhukov - 3.15-1 +- Move /afs into main package + +* Fri Aug 07 2020 Pavel Raiskup - 3.14-4 +- /proc and /sys made %%ghost to allow filesystem package updates in rootless + container environments (rhbz#1548403) + +-* Fri Jul 17 2020 Ruijun Ge - 3.14-2 +-- update to 3.14 version * Mon Jan 27 2020 Ondrej Vasik - 3.14-1 - do not restore context of /proc (#1722766) -- Gitee