diff --git a/SOURCES/macros.scl-filesystem b/SOURCES/macros.scl-filesystem index cb45354..61a9424 100644 --- a/SOURCES/macros.scl-filesystem +++ b/SOURCES/macros.scl-filesystem @@ -19,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 @@ -38,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 @@ -277,7 +277,7 @@ 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 +%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 @@ -285,7 +285,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 diff --git a/SPECS/scl-utils.spec b/SPECS/scl-utils.spec index 47c850d..fd625e3 100644 --- a/SPECS/scl-utils.spec +++ b/SPECS/scl-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for alternative packaging Name: scl-utils Version: 20130529 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ Group: Applications/File URL: https://fedorahosted.org/released/scl-utils/ @@ -98,6 +98,9 @@ rm -rf %buildroot %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Mon Jun 18 2018 Joe Orton - 20130529-19 +- own lib64 directories on aarch64, ppc64le (#1475718) + * Fri Jan 13 2017 Joe Orton - 20130529-18 - fix "scl enable" usage in shebang lines (#1372700)