add /run to filesystem (#69124) , minor spec file cleanup (thanks H.Hoyer)
This commit is contained in:
parent
8c6fca2162
commit
8b25fdb6bc
@ -1,6 +1,6 @@
|
|||||||
Summary: The basic directory layout for a Linux system
|
Summary: The basic directory layout for a Linux system
|
||||||
Name: filesystem
|
Name: filesystem
|
||||||
Version: 2.4.38
|
Version: 2.4.39
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
URL: https://fedorahosted.org/filesystem
|
URL: https://fedorahosted.org/filesystem
|
||||||
@ -35,7 +35,7 @@ cd %{buildroot}
|
|||||||
|
|
||||||
mkdir -p bin boot dev \
|
mkdir -p bin boot dev \
|
||||||
etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \
|
etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \
|
||||||
home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \
|
home lib/modules %{_lib}/tls media mnt opt proc root run sbin selinux srv sys tmp \
|
||||||
usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,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,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},src,src/kernels,src/debug} \
|
usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,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,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},src,src/kernels,src/debug} \
|
||||||
var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
|
var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
|
||||||
|
|
||||||
@ -93,13 +93,17 @@ cat $RPM_BUILD_DIR/filelist | grep "/share/man" | while read a b c d; do
|
|||||||
mkdir -p -m 755 %{buildroot}/$d/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}
|
mkdir -p -m 755 %{buildroot}/$d/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}
|
||||||
done
|
done
|
||||||
|
|
||||||
for i in `echo man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}`; do
|
for i in man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}; do
|
||||||
echo "/usr/share/man/$i" >>$RPM_BUILD_DIR/filelist
|
echo "/usr/share/man/$i" >>$RPM_BUILD_DIR/filelist
|
||||||
done
|
done
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
|
%post -p <lua>
|
||||||
|
posix.symlink("../run", "/var/run")
|
||||||
|
posix.symlink("../run/lock", "/var/lock")
|
||||||
|
|
||||||
%files -f filelist
|
%files -f filelist
|
||||||
%defattr(0755,root,root,-)
|
%defattr(0755,root,root,-)
|
||||||
%dir %attr(555,root,root) /
|
%dir %attr(555,root,root) /
|
||||||
@ -125,6 +129,7 @@ rm -rf %{buildroot}
|
|||||||
%dir /opt
|
%dir /opt
|
||||||
%attr(555,root,root) /proc
|
%attr(555,root,root) /proc
|
||||||
%attr(550,root,root) /root
|
%attr(550,root,root) /root
|
||||||
|
/run
|
||||||
%attr(555,root,root) /sbin
|
%attr(555,root,root) /sbin
|
||||||
/selinux
|
/selinux
|
||||||
/srv
|
/srv
|
||||||
@ -170,20 +175,20 @@ rm -rf %{buildroot}
|
|||||||
/usr/src
|
/usr/src
|
||||||
/usr/tmp
|
/usr/tmp
|
||||||
%dir /var
|
%dir /var
|
||||||
|
/var/cache
|
||||||
/var/db
|
/var/db
|
||||||
|
/var/empty
|
||||||
/var/games
|
/var/games
|
||||||
/var/lib
|
/var/lib
|
||||||
/var/local
|
/var/local
|
||||||
%dir %attr(0755,root,root) /var/lock
|
%ghost %attr(755,root,root) /var/lock
|
||||||
%ghost /var/lock/subsys
|
%ghost /var/lock/subsys
|
||||||
/var/cache
|
|
||||||
/var/empty
|
|
||||||
/var/log
|
/var/log
|
||||||
/var/mail
|
/var/mail
|
||||||
/var/nis
|
/var/nis
|
||||||
/var/opt
|
/var/opt
|
||||||
/var/preserve
|
/var/preserve
|
||||||
/var/run
|
%ghost %attr(755,root,root) /var/run
|
||||||
%dir /var/spool
|
%dir /var/spool
|
||||||
%attr(755,root,root) /var/spool/lpd
|
%attr(755,root,root) /var/spool/lpd
|
||||||
%attr(775,root,mail) /var/spool/mail
|
%attr(775,root,mail) /var/spool/mail
|
||||||
@ -192,6 +197,10 @@ rm -rf %{buildroot}
|
|||||||
%config /etc/tmpfiles.d/filesystem.conf
|
%config /etc/tmpfiles.d/filesystem.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 31 2011 Ondrej Vasik <ovasik@redhat.com> 2.4-39-1
|
||||||
|
- add /run to filesystem (#692124)
|
||||||
|
- minor spec file cleanup
|
||||||
|
|
||||||
* Fri Feb 25 2011 Ondrej Vasik <ovasik@redhat.com> 2.4.38-1
|
* Fri Feb 25 2011 Ondrej Vasik <ovasik@redhat.com> 2.4.38-1
|
||||||
- do /var/lock/subsys directory systemd way via tmpfiles.d conf file
|
- do /var/lock/subsys directory systemd way via tmpfiles.d conf file
|
||||||
(#656586)
|
(#656586)
|
||||||
|
Loading…
Reference in New Issue
Block a user