[xmonad] fix user binary ldd check on i686/i386 and then recompile directly
Jens Petersen
petersen at fedoraproject.org
Tue May 29 00:49:42 UTC 2012
commit bc488c953b7d3bf8d802a08a6c1ad5b61d3082c6
Author: Jens Petersen <petersen at redhat.com>
Date: Tue May 29 09:49:36 2012 +0900
fix user binary ldd check on i686/i386 and then recompile directly
xmonad-start | 4 ++--
xmonad.spec | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/xmonad-start b/xmonad-start
index 25c653c..3d45d0a 100644
--- a/xmonad-start
+++ b/xmonad-start
@@ -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
diff --git a/xmonad.spec b/xmonad.spec
index ee8f892..86c3464 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -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 at 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 at redhat.com> - 0.10-9
- basic subpackage should only obsolete core from before the split
More information about the scm-commits
mailing list