From 87db3385fae16372395dd40f3127879b34e8a6b2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 26 Nov 2013 13:22:25 +0900 Subject: [PATCH] XFCE Terminal is now called xfce4-terminal (#1034353) Reported by Scott Stevenson: since 0.6.0 Terminal was renamed to xfce4-terminal (F19 shipped with 0.6.2) --- .chain-deps | 1 - ghc-xmonad-contrib.spec | 7 ++++++- xmonad-contrib-0.11.2-xfce4-terminal.patch | 11 +++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) delete mode 100644 .chain-deps create mode 100644 xmonad-contrib-0.11.2-xfce4-terminal.patch diff --git a/.chain-deps b/.chain-deps deleted file mode 100644 index 1637855..0000000 --- a/.chain-deps +++ /dev/null @@ -1 +0,0 @@ -ghc-X11 : xmonad ghc-X11-xft : diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec index 5acee8c..e25e4ca 100644 --- a/ghc-xmonad-contrib.spec +++ b/ghc-xmonad-contrib.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.11.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Third party extensions for xmonad License: BSD @@ -14,6 +14,7 @@ Patch0: xmonad-contrib-use_xft-flag.patch Patch1: xmonad-contrib-0.10-xft-fonts.patch Patch2: xmonad-contrib-0.10-ewmh-set-NET_WM_STATE.patch Patch4: xmonad-contrib-0.10-PositionStore-dont-rescale-with-screen.patch +Patch5: xmonad-contrib-0.11.2-xfce4-terminal.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -63,6 +64,7 @@ This package provides the Haskell %{pkg_name} library development files. %patch1 -p1 -b .orig-misc-fixed %patch2 -p1 -b .orig-NET_WM_STATE %patch4 -p1 -b .orig-rescale +%patch5 -p1 -b .orig-Terminal %build @@ -90,6 +92,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Nov 26 2013 Jens Petersen - 0.11.2-3 +- XFCE Terminal is now called xfce4-terminal (#1034353) + * Sat Aug 03 2013 Fedora Release Engineering - 0.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/xmonad-contrib-0.11.2-xfce4-terminal.patch b/xmonad-contrib-0.11.2-xfce4-terminal.patch new file mode 100644 index 0000000..b9fe7a8 --- /dev/null +++ b/xmonad-contrib-0.11.2-xfce4-terminal.patch @@ -0,0 +1,11 @@ +--- xmonad-contrib-0.11.2/XMonad/Config/Xfce.hs~ 2013-07-16 11:52:10.000000000 +0900 ++++ xmonad-contrib-0.11.2/XMonad/Config/Xfce.hs 2013-11-26 13:16:20.023315724 +0900 +@@ -35,7 +35,7 @@ + -- For examples of how to further customize @xfceConfig@ see "XMonad.Config.Desktop". + + xfceConfig = desktopConfig +- { terminal = "Terminal" ++ { terminal = "xfce4-terminal" + , keys = xfceKeys <+> keys desktopConfig } + + xfceKeys (XConfig {modMask = modm}) = M.fromList $