fix %pre old %{_includedir}/asm symlink stuff [release 2.19-3mamba;Wed Jun 11 2014]
This commit is contained in:
parent
6bf54b868f
commit
ffb4bcc4c9
24
glibc.spec
24
glibc.spec
@ -101,21 +101,17 @@
|
|||||||
%define build_selinux 0
|
%define build_selinux 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if "%{?KERNEL_VER}" == ""
|
%if "%{?KERNEL_VER}" == ""
|
||||||
%define KERNEL_VER %(uname -r | sed "s|\\([0-9.]*\\).*|\\1|" )
|
%define KERNEL_VER %(uname -r | sed "s|\\([0-9.]*\\).*|\\1|" )
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{?KERNEL_TARGET}" == ""
|
%if "%{?KERNEL_TARGET}" == ""
|
||||||
# build a mamba kernel by default
|
%define KERNEL_TARGET %(uname -r | sed "s|[0-9.]*\\(.*\\)|\\1|" )
|
||||||
%define KERNEL_TARGET mamba
|
|
||||||
%else
|
|
||||||
%define KERNEL_TARGET_APPEND -%{KERNEL_TARGET}
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: glibc
|
Name: glibc
|
||||||
Version: 2.19
|
Version: 2.19
|
||||||
Release: 2mamba
|
Release: 3mamba
|
||||||
Summary: The GNU libc libraries
|
Summary: The GNU libc libraries
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -674,9 +670,9 @@ fi
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%pre %{?multilib:multilib-}devel
|
%pre %{?multilib:multilib-}devel
|
||||||
[ -L %{_includedir}/asm ] && exit 0
|
[ -L %{_includedir}/asm ] && rm -f %{_includedir}/asm
|
||||||
|
|
||||||
# FIX an upgrade problem with /usr/include/asm becoming symlink
|
# Remove old directory asm-<arch>
|
||||||
case %{target_cpu} in
|
case %{target_cpu} in
|
||||||
i*86 | athlon*)
|
i*86 | athlon*)
|
||||||
platform_includes=asm-i386
|
platform_includes=asm-i386
|
||||||
@ -692,11 +688,10 @@ case %{target_cpu} in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
[ -L %{_includedir}/asm ] || {
|
if [ "$platform_includes" -a -d %{_includedir}/$platform_includes ]; then
|
||||||
mkdir -p %{_includedir}/$platform_includes
|
rm -f %{_includedir}/$platform_includes/*
|
||||||
mv %{_includedir}/asm/* %{_includedir}/$platform_includes
|
rmdir %{_includedir}/$platform_includes
|
||||||
rm -rf %{_includedir}/asm
|
fi
|
||||||
}
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
@ -912,6 +907,9 @@ exit 0
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 11 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.19-3mamba
|
||||||
|
- fix %pre old %{_includedir}/asm symlink stuff
|
||||||
|
|
||||||
* Sun Apr 20 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.19-2mamba
|
* Sun Apr 20 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.19-2mamba
|
||||||
- rebuilt with enable-obsolete-rpc required by pwdutils
|
- rebuilt with enable-obsolete-rpc required by pwdutils
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user