rpms/scl-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Get macros.scl-filesystem in sync with the rest of the code

Browse Source
This commit is contained in:
Jan Zeleny 2014-12-11 14:09:22 +01:00
parent 0cf460bd64
commit 2a2860fc6e
1 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
macros.scl-filesystem
View File

@ -8,15 +8,15 @@
%{_scl_root}/bin %{_scl_root}/bin
%attr(555,root,root) %{_scl_root}/boot %attr(555,root,root) %{_scl_root}/boot
%{_scl_root}/dev %{_scl_root}/dev
%dir %{_scl_root}/etc %dir %{_sysconfdir}
%{_scl_root}/etc/X11 %{_sysconfdir}/X11
%{_scl_root}/etc/xdg %{_sysconfdir}/xdg
%{_scl_root}/etc/opt %{_sysconfdir}/opt
%{_scl_root}/etc/pm %{_sysconfdir}/pm
%{_scl_root}/etc/xinetd.d %{_sysconfdir}/xinetd.d
%{_scl_root}/etc/skel %{_sysconfdir}/skel
%{_scl_root}/etc/sysconfig %{_sysconfdir}/sysconfig
%{_scl_root}/etc/pki %{_sysconfdir}/pki
%{_scl_root}/home %{_scl_root}/home
%{_scl_root}/lib %{_scl_root}/lib
%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x %ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
@ -37,7 +37,7 @@
%{_scl_root}/usr/etc %{_scl_root}/usr/etc
%{_scl_root}/usr/games %{_scl_root}/usr/games
%{_scl_root}/usr/include %{_scl_root}/usr/include
%attr(555,root,root) %{_scl_root}/usr/lib %dir %attr(555,root,root) %{_scl_root}/usr/lib
%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x %ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
%attr(555,root,root) %{_scl_root}/usr/%{_lib} %attr(555,root,root) %{_scl_root}/usr/%{_lib}
%endif %endif
@ -71,29 +71,28 @@
%{_scl_root}/usr/share/X11 %{_scl_root}/usr/share/X11
%{_scl_root}/usr/src %{_scl_root}/usr/src
%{_scl_root}/usr/tmp %{_scl_root}/usr/tmp
%dir %{_scl_root}/var %dir %{_localstatedir}
%{_scl_root}/var/adm %{_localstatedir}/adm
%{_scl_root}/var/cache %{_localstatedir}/cache
%{_scl_root}/var/db %{_localstatedir}/db
%{_scl_root}/var/empty %{_localstatedir}/empty
%{_scl_root}/var/games %{_localstatedir}/games
%{_scl_root}/var/gopher %{_localstatedir}/gopher
%{_scl_root}/var/lib %{_localstatedir}/lib
%{_scl_root}/var/local %{_localstatedir}/local
%ghost %dir %attr(755,root,root) %{_scl_root}/var/lock %ghost %dir %attr(755,root,root) %{_localstatedir}/lock
%ghost %{_scl_root}/var/lock/subsys %ghost %{_localstatedir}/lock/subsys
%{_scl_root}/var/log %{_localstatedir}/log
%{_scl_root}/var/mail %{_localstatedir}/mail
%{_scl_root}/var/nis %{_localstatedir}/nis
%{_scl_root}/var/opt %{_localstatedir}/opt
%{_scl_root}/var/preserve %{_localstatedir}/preserve
%ghost %attr(755,root,root) %{_scl_root}/var/run %ghost %attr(755,root,root) %{_localstatedir}/run
%dir %{_scl_root}/var/spool %dir %{_localstatedir}/spool
%attr(755,root,root) %{_scl_root}/var/spool/lpd %attr(755,root,root) %{_localstatedir}/spool/lpd
%attr(775,root,mail) %{_scl_root}/var/spool/mail %attr(775,root,mail) %{_localstatedir}/spool/mail
%attr(755,uucp,uucp) %{_scl_root}/var/spool/uucp %attr(1777,root,root) %{_localstatedir}/tmp
%attr(1777,root,root) %{_scl_root}/var/tmp %{_localstatedir}/yp
%{_scl_root}/var/yp
} }
%scl_install %{expand: %scl_install %{expand:
@ -103,14 +102,10 @@ echo -n '%' > %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
scl %scl scl %scl
EOF EOF
echo -n '%' >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
scl_vendor %{scl_vendor}
EOF
cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
%_scl_prefix %_scl_prefix
EOF EOF
# filesystem # filelist
set +x set +x
cat >> %{buildroot}/lang-exceptions << EOF cat >> %{buildroot}/lang-exceptions << EOF
af_ZA af_ZA
@ -266,19 +261,26 @@ cat >> %{buildroot}/iso_3166.sed << EOF
} }
H H
EOF EOF
mkdir -p %{buildroot}%{_localstatedir}
pushd %{buildroot}%{_localstatedir}
mkdir -p {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}
popd
mkdir -p %{buildroot}%{_sysconfdir}
pushd %{buildroot}%{_sysconfdir}
mkdir -p {X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki}
popd
mkdir -p %{buildroot}%{_scl_root} mkdir -p %{buildroot}%{_scl_root}
rm -f $RPM_BUILD_DIR/%{buildsubdir}/filelist
rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem
pushd %{buildroot}%{_scl_root} pushd %{buildroot}%{_scl_root}
mkdir -p boot dev \\ mkdir -p boot dev \\
etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki} \\
home media mnt opt proc root run/lock srv sys tmp \\ home media mnt opt proc root run/lock srv sys tmp \\
usr/{bin,etc,games,include,lib/{games,locale,modules,sse2},libexec,local/{bin,etc,games,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,locale,modules,sse2},libexec,local/{bin,etc,games,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}
%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x %ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
mkdir -p usr/{%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},local/%{_lib}} mkdir -p usr/{%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},local/%{_lib}}
%endif %endif
ln -snf ../var/tmp usr/tmp ln -snf %{_localstatedir}/tmp usr/tmp
ln -snf spool/mail var/mail ln -snf spool/mail %{buildroot}%{_localstatedir}/mail
ln -snf usr/bin bin ln -snf usr/bin bin
ln -snf usr/sbin sbin ln -snf usr/sbin sbin
ln -snf usr/lib lib ln -snf usr/lib lib
@ -294,8 +296,8 @@ grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do
if [ "$locale" = "XX" ]; then if [ "$locale" = "XX" ]; then
locale=$b locale=$b
fi fi
echo "%lang(${locale}) %{_scl_root}/usr/share/locale/${locale}" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem echo "%lang(${locale}) %{_scl_root}/usr/share/locale/${locale}" >> $RPM_BUILD_DIR/%{buildsubdir}/filelist
echo "%lang(${locale}) %ghost %config(missingok) %{_scl_root}/usr/share/man/${locale}" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem echo "%lang(${locale}) %ghost %config(missingok) %{_scl_root}/usr/share/man/${locale}" >> $RPM_BUILD_DIR/%{buildsubdir}/filelist
done done
cat %{buildroot}/lang-exceptions | grep -v "^#" | grep -v "^$" | while read loc ; do cat %{buildroot}/lang-exceptions | grep -v "^#" | grep -v "^$" | while read loc ; do
locale=$loc locale=$loc
@ -314,23 +316,24 @@ cat %{buildroot}/lang-exceptions | grep -v "^#" | grep -v "^$" | while read loc
egrep -q "[[:space:]]${locale%%_*}[[:space:]]" \\ egrep -q "[[:space:]]${locale%%_*}[[:space:]]" \\
%{buildroot}/iso_639.tab || continue %{buildroot}/iso_639.tab || continue
fi fi
echo "%lang(${locale}) %{_scl_root}/usr/share/locale/${loc}" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem echo "%lang(${locale}) %{_scl_root}/usr/share/locale/${loc}" >> $RPM_BUILD_DIR/%{buildsubdir}/filelist
echo "%lang(${locale}) %ghost %config(missingok) %{_scl_root}/usr/share/man/${loc}" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem echo "%lang(${locale}) %ghost %config(missingok) %{_scl_root}/usr/share/man/${loc}" >> $RPM_BUILD_DIR/%{buildsubdir}/filelist
done done
rm -f %{buildroot}/iso_639.tab rm -f %{buildroot}/iso_639.tab
rm -f %{buildroot}/iso_639.sed rm -f %{buildroot}/iso_639.sed
rm -f %{buildroot}/iso_3166.tab rm -f %{buildroot}/iso_3166.tab
rm -f %{buildroot}/iso_3166.sed rm -f %{buildroot}/iso_3166.sed
rm -f %{buildroot}/lang-exceptions rm -f %{buildroot}/lang-exceptions
cat $RPM_BUILD_DIR/%{buildsubdir}/filesystem | grep "locale" | while read a b ; do cat $RPM_BUILD_DIR/%{buildsubdir}/filelist | grep "locale" | while read a b ; do
mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
done done
cat $RPM_BUILD_DIR/%{buildsubdir}/filesystem | grep "/share/man" | while read a b c d; do cat $RPM_BUILD_DIR/%{buildsubdir}/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 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 "%{_scl_root}/usr/share/man/$i" >> $RPM_BUILD_DIR/%{buildsubdir}/filesystem echo "%{_scl_root}/usr/share/man/$i" >> $RPM_BUILD_DIR/%{buildsubdir}/filelist
done done
ln -s $RPM_BUILD_DIR/%{buildsubdir}/filelist $RPM_BUILD_DIR/%{buildsubdir}/filesystem
set -x set -x
popd popd
} }