[xmonad/f15] revert the xmonad-dynamic-link.patch change to avoid changing the ABI hash
Jens Petersen
petersen at fedoraproject.org
Tue Jan 17 08:18:20 UTC 2012
commit b30bab3adbce529929db32ad17eeeb351869835e
Author: Jens Petersen <petersen at redhat.com>
Date: Tue Jan 17 17:18:03 2012 +0900
revert the xmonad-dynamic-link.patch change to avoid changing the ABI hash
xmonad-dynamic-link.patch | 2 +-
xmonad.spec | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/xmonad-dynamic-link.patch b/xmonad-dynamic-link.patch
index 92c7629..923f6d5 100644
--- a/xmonad-dynamic-link.patch
+++ b/xmonad-dynamic-link.patch
@@ -6,7 +6,7 @@ diff -u xmonad-0.9.1/XMonad/Core.hs\~ xmonad-0.9.1/XMonad/Core.hs
uninstallSignalHandlers
status <- bracket (openFile err WriteMode) hClose $ \h -> do
- waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
-+ waitForProcess =<< runProcess "ghc" ["-dynamic", "-no-user-package-conf", "--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
++ waitForProcess =<< runProcess "ghc" ["-dynamic", "--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
Nothing Nothing Nothing (Just h)
-- re-enable SIGCHLD:
diff --git a/xmonad.spec b/xmonad.spec
index 87f706a..8b16265 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -16,7 +16,7 @@ on several screens.
Name: %{pkg_name}
Version: 0.9.2
-Release: 9%{?dist}
+Release: 8.1%{?dist}
Summary: A tiling window manager
Group: User Interface/X
@@ -119,9 +119,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
%changelog
-* Thu Jun 16 2011 Jens Petersen <petersen at redhat.com> - 0.9.2-9
-- ignore user configured packages when recompiling user xmonad.hs
- to avoid linking errors (#713035)
+* Thu Jun 16 2011 Jens Petersen <petersen at redhat.com> - 0.9.2-8.1
- don't display README.fedora initially on startup anymore
- drop the ghc-xmonad requires from xmonad-core
- update to cabal2spec-0.23.2
More information about the scm-commits
mailing list