Attachment 864792 Details for Bug 1066665 – Changes to the rpm macros that assist in scl meta package creation

[patch] Changes to the rpm macros that assist in scl meta package creation

macros.scl-filesystem.patch (text/plain), 4.76 KB, created by Toshio Ernie Kuratomi on 2014-02-18 20:47:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2014-02-18 20:47:55 UTC

Size: 4.76 KB

patch

obsolete

>--- macros.scl-filesystem.orig	2014-02-18 12:40:20.466192597 -0800
>+++ macros.scl-filesystem	2014-02-17 17:00:35.000000000 -0800
>@@ -8,15 +8,15 @@
> %{_scl_root}/bin
> %attr(555,root,root) %{_scl_root}/boot
> %{_scl_root}/dev
>-%dir %{_scl_root}/etc
>-%{_scl_root}/etc/X11
>-%{_scl_root}/etc/xdg
>-%{_scl_root}/etc/opt
>-%{_scl_root}/etc/pm
>-%{_scl_root}/etc/xinetd.d
>-%{_scl_root}/etc/skel
>-%{_scl_root}/etc/sysconfig
>-%{_scl_root}/etc/pki
>+%dir %{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/X11
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/xdg
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/opt
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/pm
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/xinetd.d
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/skel
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/sysconfig
>+%{_root_sysconfdir}/opt/%{scl_vendor}/scls/%{scl}/pki
> %{_scl_root}/home
> %{_scl_root}/lib
> %ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
>@@ -71,29 +71,29 @@
> %{_scl_root}/usr/share/X11
> %{_scl_root}/usr/src
> %{_scl_root}/usr/tmp
>-%dir %{_scl_root}/var
>-%{_scl_root}/var/adm
>-%{_scl_root}/var/cache
>-%{_scl_root}/var/db
>-%{_scl_root}/var/empty
>-%{_scl_root}/var/games
>-%{_scl_root}/var/gopher
>-%{_scl_root}/var/lib
>-%{_scl_root}/var/local
>-%ghost %dir %attr(755,root,root) %{_scl_root}/var/lock
>-%ghost %{_scl_root}/var/lock/subsys
>-%{_scl_root}/var/log
>-%{_scl_root}/var/mail
>-%{_scl_root}/var/nis
>-%{_scl_root}/var/opt
>-%{_scl_root}/var/preserve
>-%ghost %attr(755,root,root) %{_scl_root}/var/run
>-%dir %{_scl_root}/var/spool
>-%attr(755,root,root) %{_scl_root}/var/spool/lpd
>-%attr(775,root,mail) %{_scl_root}/var/spool/mail
>-%attr(755,uucp,uucp) %{_scl_root}/var/spool/uucp
>-%attr(1777,root,root) %{_scl_root}/var/tmp
>-%{_scl_root}/var/yp
>+%dir %{_localstatedir}
>+%{_localstatedir}/adm
>+%{_localstatedir}/cache
>+%{_localstatedir}/db
>+%{_localstatedir}/empty
>+%{_localstatedir}/games
>+%{_localstatedir}/gopher
>+%{_localstatedir}/lib
>+%{_localstatedir}/local
>+%ghost %dir %attr(755,root,root) %{_localstatedir}/lock
>+%ghost %{_localstatedir}/lock/subsys
>+%{_localstatedir}/log
>+%{_localstatedir}/mail
>+%{_localstatedir}/nis
>+%{_localstatedir}/opt
>+%{_localstatedir}/preserve
>+%ghost %attr(755,root,root) %{_localstatedir}/run
>+%dir %{_localstatedir}/spool
>+%attr(755,root,root) %{_localstatedir}/spool/lpd
>+%attr(775,root,mail) %{_localstatedir}/spool/mail
>+%attr(755,uucp,uucp) %{_localstatedir}/spool/uucp
>+%attr(1777,root,root) %{_localstatedir}/tmp
>+%{_localstatedir}/yp
> }
> 
> %scl_install %{expand:
>@@ -262,19 +262,25 @@
> }
> H
> 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}
> rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem
> pushd %{buildroot}%{_scl_root}
> 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 \\
>-        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}
>+        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}
> %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}}
> %endif
>-ln -snf ../var/tmp usr/tmp
>-ln -snf spool/mail var/mail
>+ln -snf %{_localstatedir}/tmp usr/tmp
>+ln -snf spool/mail %{buildroot}%{_localstatedir}/mail
> ln -snf usr/bin bin
> ln -snf usr/sbin sbin
> ln -snf usr/lib lib

Actions: View | Diff

Attachments on bug 1066665: 864791 | 864792