From db1a13ff35c19d317dc9f6d707ae4b58a573f63b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 4 Sep 2021 16:35:39 +0200 Subject: F35 rebuild --- macros.scl-filesystem | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'macros.scl-filesystem') diff --git a/macros.scl-filesystem b/macros.scl-filesystem index 1e51cf9..b64cba6 100644 --- a/macros.scl-filesystem +++ b/macros.scl-filesystem @@ -4,8 +4,6 @@ %dir %attr(555,root,root) %{_scl_root} %dir %attr(555,root,root) %{_scl_scripts} %{_scl_scripts}/enable -%{_scl_scripts}/%{scl} -%{_root_sysconfdir}/scl/modulefiles/%{scl} %{_root_sysconfdir}/scl/prefixes/%scl %{_scl_root}/bin %attr(555,root,root) %{_scl_root}/boot @@ -21,7 +19,7 @@ %{_sysconfdir}/pki %{_scl_root}/home %{_scl_root}/lib -%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x +%ifarch x86_64 ppc ppc64 ppc64le aarch64 sparc sparc64 s390 s390x %{_scl_root}/%{_lib} %endif %{_scl_root}/media @@ -40,7 +38,7 @@ %{_scl_root}/usr/games %{_scl_root}/usr/include %dir %attr(555,root,root) %{_scl_root}/usr/lib -%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x +%ifarch x86_64 ppc ppc64 ppc64le aarch64 sparc sparc64 s390 s390x %attr(555,root,root) %{_scl_root}/usr/%{_lib} %endif %{_scl_root}/usr/libexec @@ -61,6 +59,7 @@ %{_scl_root}/usr/share/icons %{_scl_root}/usr/share/idl %{_scl_root}/usr/share/info +%dir %{_scl_root}/usr/share/licenses %dir %{_scl_root}/usr/share/locale %dir %{_scl_root}/usr/share/man %{_scl_root}/usr/share/mime-info @@ -103,14 +102,12 @@ mkdir -p %{buildroot}%{_root_sysconfdir}/{rpm,scl/{prefixes,modulefiles}} cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF %%%%scl %scl %{?nfsmountable:%%%%nfsmountable %{nfsmountable}} -%{!?nfsmountable:%%%%undefine nfsmountable} %{?rh_layout:%%%%rh_layout %{rh_layout}} -%{!?rh_layout:%%%%undefine rh_layout} EOF cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF %_scl_prefix EOF -ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl} +test -e %{buildroot}%{_scl_scripts}/%{scl} && ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl} # filelist set +x cat >> %{buildroot}/lang-exceptions << EOF @@ -281,8 +278,8 @@ rm -f $RPM_BUILD_DIR/%{buildsubdir}/filesystem pushd %{buildroot}%{_scl_root} mkdir -p boot dev \\ 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} -%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x + 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,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},src,src/kernels,src/debug} +%ifarch x86_64 ppc ppc64 ppc64le aarch64 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 %{_localstatedir}/tmp usr/tmp @@ -290,7 +287,7 @@ ln -snf spool/mail %{buildroot}%{_localstatedir}/mail ln -snf usr/bin bin ln -snf usr/sbin sbin ln -snf usr/lib lib -%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x +%ifarch x86_64 ppc ppc64 ppc64le aarch64 sparc sparc64 s390 s390x ln -snf usr/%{_lib} %{_lib} %endif sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml >%{buildroot}/iso_639.tab -- cgit