[xmobar] hide desktop file from desktop menu; use cabal_configure_options, cabal_bin_build, ghc_without_dynam
Jens Petersen
petersen at fedoraproject.org
Sat Mar 12 12:56:27 UTC 2011
commit fb2a936cf115f47ea1369735a4e03ea5e23657ba
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Mar 12 21:56:23 2011 +0900
hide desktop file from desktop menu; use cabal_configure_options, cabal_bin_build, ghc_without_dynamic
xmobar.desktop | 1 +
xmobar.spec | 16 ++++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/xmobar.desktop b/xmobar.desktop
index 510f1ba..6064406 100644
--- a/xmobar.desktop
+++ b/xmobar.desktop
@@ -7,3 +7,4 @@ Terminal=false
Name=XMobar status bar
GenericName=Status bar
Comment=Text-based status bar inspired by Ion3
+NoDisplay=true
diff --git a/xmobar.spec b/xmobar.spec
index 2ce8def..033c2ff 100644
--- a/xmobar.spec
+++ b/xmobar.spec
@@ -1,5 +1,4 @@
# link with shared libs
-%bcond_without dynamic
%bcond_without hinotify
%bcond_without libmpd
%bcond_with iwlib
@@ -9,7 +8,7 @@
Name: xmobar
Version: 0.12
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A minimalistic text-based status bar
Group: User Interface/X
@@ -52,13 +51,10 @@ cp %{SOURCE2} scripts/xmonadpropwrite.hs
%build
-%cabal_configure --ghc --flags="with_utf8 with_xft" \
- %{?with_hinotify:--flags="with_inotify"} \
- %{?with_libmpd: --flags="with_mpd"} \
- %{?with_iwlib: --flags="with_iwlib"}
-%cabal build
+%define cabal_configure_options --flags="with_utf8 with_xft %{?with_hinotify:with_inotify} %{?with_libmpd:with_mpd} %{?with_iwlib:with_iwlib}"
+%cabal_bin_build
pushd scripts
-%{_bindir}/ghc %{?with_dynamic:-dynamic} --make xmonadpropwrite.hs
+%{_bindir}/ghc %{!?ghc_without_dynamic:-dynamic} --make xmonadpropwrite.hs
popd
@@ -83,6 +79,10 @@ popd
%changelog
+* Sat Mar 12 2011 Jens Petersen <petersen at redhat.com> - 0.12-5
+- hide desktop file from desktop menu (#674731)
+- use cabal_configure_options, cabal_bin_build, ghc_without_dynamic
+
* Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.12-4
- Enable build on sparcv9
More information about the scm-commits
mailing list