From 9595652b22a7db6ff52f37e0f5fa8344c839a363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Mon, 28 Jul 2014 15:31:13 +0200 Subject: [PATCH] add ownership for /usr/share/licenses (#1121416), have /media as symlink to /run/media (#965918) --- filesystem.spec | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index 2fba3af..5fccdfb 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -1,7 +1,7 @@ Summary: The basic directory layout for a Linux system Name: filesystem Version: 3.2 -Release: 27%{?dist} +Release: 28%{?dist} License: Public Domain URL: https://fedorahosted.org/filesystem Group: System Environment/Base @@ -33,14 +33,15 @@ cd %{buildroot} mkdir -p boot dev \ etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki,bash_completion.d} \ - home media mnt opt proc root run srv sys tmp \ - usr/{bin,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/usr,games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_lib},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,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \ + home mnt opt proc root run/media srv sys tmp \ + usr/{bin,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/usr,games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_lib},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,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,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},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \ var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache,opt,games,yp} #do not create the symlink atm. #ln -snf etc/sysconfig etc/default ln -snf ../var/tmp usr/tmp ln -snf spool/mail var/mail +ln -snf run/media media ln -snf usr/bin bin ln -snf usr/sbin sbin ln -snf usr/lib lib @@ -135,7 +136,9 @@ 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("/run/media") posix.mkdir("/var") +posix.symlink("run/media", "/media") posix.symlink("../run", "/var/run") posix.symlink("../run/lock", "/var/lock") return 0 @@ -150,6 +153,8 @@ restorecon /sys 2>/dev/null >/dev/null || : restorecon /boot 2>dev/null >/dev/null || : restorecon /proc 2>dev/null >/dev/null || : restorecon /dev 2>dev/null >/dev/null || : +restorecon /media 2>/dev/null >/dev/null || : +restorecon /run/media 2>/dev/null >/dev/null || : %files -f filelist %defattr(0755,root,root,-) @@ -177,7 +182,8 @@ restorecon /dev 2>dev/null >/dev/null || : %dir /opt %attr(555,root,root) /proc %attr(550,root,root) /root -/run +%dir /run +/run/media /sbin /srv %attr(555,root,root) /sys @@ -222,6 +228,7 @@ restorecon /dev 2>dev/null >/dev/null || : /usr/share/icons /usr/share/idl /usr/share/info +%dir /usr/share/licenses %dir /usr/share/locale %dir /usr/share/man /usr/share/mime-info @@ -258,6 +265,10 @@ restorecon /dev 2>dev/null >/dev/null || : /var/yp %changelog +* Mon Jul 28 2014 Ondrej Vasik - 3.2-28 +- add ownership for /usr/share/licenses (#1121416) +- have /media as symlink to /run/media (#965918) + * Mon Jul 14 2014 Ondrej Vasik - 3.2-27 - add ownership for /usr/share/wayland-sessions (#1022423)