fix user binary ldd check on i686/i386 and then recompile directly

This commit is contained in:
Jens Petersen 2012-05-29 09:49:36 +09:00
parent 7ad58e01a2
commit bc488c953b
2 changed files with 7 additions and 3 deletions

View File

@ -18,10 +18,10 @@ if [ ! -d $XMONAD_DIR ]; then
esac
(sleep 5; $TERM_CMD man xmonad) &
else
XMONAD_CUSTOM=$XMONAD_DIR/xmonad-$(arch)-linux
XMONAD_CUSTOM=$XMONAD_DIR/xmonad-$(uname -i)-linux
if [ -r $XMONAD_DIR/xmonad.hs -a -x $XMONAD_CUSTOM ]; then
if ldd $XMONAD_DIR/xmonad-$(arch)-linux | grep -q "not found"; then
touch $XMONAD_DIR/xmonad.hs
xmonad --recompile
fi
fi
fi

View File

@ -18,7 +18,7 @@ on several screens.
Name: %{pkg_name}
Version: 0.10
Release: 9%{?dist}
Release: 10%{?dist}
Summary: A tiling window manager
Group: User Interface/X
@ -176,6 +176,10 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
%changelog
* Tue May 29 2012 Jens Petersen <petersen@redhat.com> - 0.10-10
- fix user binary ldd check on i686/i386 using "uname -i" not "arch",
and then recompile directly instead of just touching xmonad.hs first
* Fri May 25 2012 Jens Petersen <petersen@redhat.com> - 0.10-9
- basic subpackage should only obsolete core from before the split