[xmobar] update xmobar-0.13-default-fonts.patch and remove xmobar-0.14-MPD-ghc74-Show.patch

[Jens Petersen]

commit 1f9f62ab4e1863ebaf456c0c652a5780a852996b
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jun 11 12:28:26 2012 +0900

    update xmobar-0.13-default-fonts.patch and remove xmobar-0.14-MPD-ghc74-Show.patch

 xmobar-0.13-default-fonts.patch  |    4 ++--
 xmobar-0.14-MPD-ghc74-Show.patch |   10 ----------
 xmobar.spec                      |   10 ++++++----
 3 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/xmobar-0.13-default-fonts.patch b/xmobar-0.13-default-fonts.patch
index 5370d18..72a436f 100644
--- a/xmobar-0.13-default-fonts.patch
+++ b/xmobar-0.13-default-fonts.patch
@@ -3,9 +3,9 @@
 @@ -1,4 +1,4 @@
 -Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
 +Config { font = "xft:mono-12"
+        , borderColor = "black"
+        , border = TopB
         , bgColor = "black"
-        , fgColor = "grey"
-        , position = Top
 --- a/src/XUtil.hsc	2011-05-28 18:03:01.226823112 +0400
 +++ b/src/XUtil.hsc	2011-05-28 18:03:16.017823085 +0400
 @@ -99,7 +99,7 @@
diff --git a/xmobar.spec b/xmobar.spec
index 953409d..f5ce3c9 100644
--- a/xmobar.spec
+++ b/xmobar.spec
@@ -8,8 +8,8 @@
 %bcond_with    alsa
 
 Name:           xmobar
-Version:        0.14
-Release:        4%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        A minimalistic text-based status bar
 
 Group:          User Interface/X
@@ -23,7 +23,6 @@ BuildRequires:  ghc-rpm-macros
 # END cabal2spec
 Source1:        xmobar.desktop
 Patch1:         xmobar-0.13-default-fonts.patch
-Patch2:         xmobar-0.14-MPD-ghc74-Show.patch
 
 %if %{with alsa}
 BuildRequires:  ghc-alsa-mixer-devel
@@ -63,7 +62,6 @@ color management, output templates, and extensibility through plugins.
 %prep
 %setup -q
 %patch1 -p1 -b .fonts
-%patch2 -p1 -b .show
 
 
 %build
@@ -90,6 +88,10 @@ install --mode=0755 -p samples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadprop
 
 
 %changelog
+* Mon Jun 11 2012 Jens Petersen <petersen at redhat.com> - 0.15-1
+- update to 0.15
+- xmobar-0.14-MPD-ghc74-Show.patch no longer needed
+
 * Wed Mar 21 2012 Jens Petersen <petersen at redhat.com> - 0.14-4
 - fix MPD build on ghc-7.4