defer the /etc/default ownership to resolve the build tree conflicts

This commit is contained in:
Ondřej Vašík 2012-10-29 13:40:03 +01:00
parent cf14c8b2d0
commit 27fe91a701

View File

@ -1,7 +1,7 @@
Summary: The basic directory layout for a Linux system
Name: filesystem
Version: 3.2
Release: 1%{?dist}
Release: 2%{?dist}
License: Public Domain
URL: https://fedorahosted.org/filesystem
Group: System Environment/Base
@ -41,7 +41,8 @@ mkdir -p boot dev \
usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{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,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/{adm,empty,gopher,lib/{games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp}
ln -snf etc/sysconfig etc/default
#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 usr/bin bin
@ -148,7 +149,6 @@ posix.symlink("../run/lock", "/var/lock")
/etc/xinetd.d
/etc/skel
/etc/sysconfig
/etc/default
/etc/pki
/etc/bash_completion.d/
/home
@ -230,6 +230,9 @@ posix.symlink("../run/lock", "/var/lock")
/var/yp
%changelog
* Mon Oct 29 2012 Ondrej Vasik <ovasik@redhat.com> 3.2-2
- defer the /etc/default ownership to resolve the build tree conflicts
* Sat Oct 27 2012 Ondrej Vasik <ovasik@redhat.com> 3.2-1
- own /etc/bash_completion.d (#870193)
- own /etc/default and create it as symlink do /etc/sysconfig (#797316)