From 58bd103fcc522490c457c8ee5f1f7532a0a39767 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 25 Feb 2013 16:11:47 +0100 Subject: [PATCH] change xmonad-gnome to xmonad-mate (since gnome-panel is gone in f19) - subpackage rename and corresponding renamings from gnome to mate - forward-port xmonad-start arg from f16 needs testing! --- README.fedora | 10 +++------ xmonad-gnome-session.desktop | 6 ------ xmonad-mate-session.desktop | 6 ++++++ xmonad-start | 18 +++++++++++----- xmonad.hs | 2 +- xmonad.session | 6 ------ xmonad.spec | 40 ++++++++++++++++++++---------------- 7 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 xmonad-gnome-session.desktop create mode 100644 xmonad-mate-session.desktop delete mode 100644 xmonad.session diff --git a/README.fedora b/README.fedora index 5ce215d..907169a 100644 --- a/README.fedora +++ b/README.fedora @@ -3,17 +3,13 @@ xmonad in Fedora is provided by 3 subpackages: - xmonad-basic: just the base window manager and X session files - xmonad: additionally installs the devel library files needed to configure and customize xmonad -- xmonad-gnome: additionally includes a gnome session file and requires gnome-session and gnome-terminal +- xmonad-mate: additionally includes a mate session file and requires mate-session-manager and terminal = Starting from GDM = xmonad can be started from GDM by selecting "xmonad" in the session menu. -For GNOME support please install xmonad-gnome -and select "xmonad GNOME" in GDM's session menu, which will run -"gnome-session --session=xmonad". - -= Gnome Panel = -To activate the gnome-panel menu use Alt+Super+Button3 or Alt+Button3. +For MATE support please install xmonad-mate +and select "xmonad MATE" in GDM's session menu. = xmonad-start = For new users without "~/.xmonad/", Fedora's xmonad-start script diff --git a/xmonad-gnome-session.desktop b/xmonad-gnome-session.desktop deleted file mode 100644 index 34fa77c..0000000 --- a/xmonad-gnome-session.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=xmonad-gnome -Comment=Tiling window manager -TryExec=/usr/bin/gnome-session -Exec=gnome-session --session=xmonad -Type=XSession diff --git a/xmonad-mate-session.desktop b/xmonad-mate-session.desktop new file mode 100644 index 0000000..9798063 --- /dev/null +++ b/xmonad-mate-session.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=xmonad-mate +Comment=Tiling window manager +TryExec=/usr/bin/mate-session +Exec=xmonad-start mate-session +Type=XSession diff --git a/xmonad-start b/xmonad-start index b973553..92c7912 100644 --- a/xmonad-start +++ b/xmonad-start @@ -13,7 +13,7 @@ if [ ! -d $XMONAD_DIR ]; then fi # display the manpage case $DESKTOP_SESSION in - xmonad-gnome) TERM_CMD="gnome-terminal -x" ;; + xmonad-mate) TERM_CMD="mate-terminal -x" ;; *) TERM_CMD="xterm -e" ;; esac (sleep 5; $TERM_CMD man xmonad) & @@ -27,14 +27,22 @@ else fi case $DESKTOP_SESSION in - xmonad-gnome) + xmonad-mate) # hack for gnome-session not starting screensaver for xmonad, etc - SCREENSAVER=/usr/bin/gnome-screensaver - [ -x "$SCREENSAVER" ] && $SCREENSAVER & ;; + SCREENSAVER=/usr/bin/mate-screensaver +# FIXME STILL NEEDED? [ -x "$SCREENSAVER" ] && $SCREENSAVER & ;; esac if [ -r $XMONAD_DIR/session ]; then sh $XMONAD_DIR/session fi -xmonad +if [ -n "$*" ]; then + if [ -d $XMONAD_DIR -a "$(ls -t $XMONAD_DIR | head -1)" = "xmonad.hs" ]; then + xmonad --recompile + fi + xmonad & + $* +else + xmonad +fi diff --git a/xmonad.hs b/xmonad.hs index 215f516..5766323 100644 --- a/xmonad.hs +++ b/xmonad.hs @@ -16,5 +16,5 @@ main = do desktop "gnome" = gnomeConfig desktop "kde" = kde4Config desktop "xfce" = xfceConfig -desktop "xmonad-gnome" = gnomeConfig +desktop "xmonad-mate" = gnomeConfig desktop _ = desktopConfig diff --git a/xmonad.session b/xmonad.session deleted file mode 100644 index c645234..0000000 --- a/xmonad.session +++ /dev/null @@ -1,6 +0,0 @@ -[GNOME Session] -Name=xmonad session -RequiredComponents=gnome-panel;gnome-settings-daemon; -RequiredProviders=windowmanager;notifications; -DefaultProvider-windowmanager=xmonad -DefaultProvider-notifications=notification-daemon diff --git a/xmonad.spec b/xmonad.spec index 8715a04..ecdc02d 100644 --- a/xmonad.spec +++ b/xmonad.spec @@ -17,7 +17,7 @@ on several screens. Name: %{pkg_name} Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tiling window manager License: BSD @@ -27,8 +27,7 @@ Source1: xmonad-session.desktop Source2: xmonad-start Source3: xmonad.desktop Source4: README.fedora -Source5: xmonad-gnome-session.desktop -Source6: xmonad.session +Source5: xmonad-mate-session.desktop Source7: xmonad.hs BuildRequires: ghc-Cabal-devel @@ -54,7 +53,7 @@ Requires: %{pkg_name}-config = %{version}-%{release} This is a meta-package that installs xmonad-basic and ghc-xmonad-contrib-devel, allowing xmonad to be customized with "~/.xmonad/xmonad.hs". -To use xmonad with GNOME, please install xmonad-gnome. +To use xmonad with GNOME/MATE, please install xmonad-mate. %package basic @@ -71,7 +70,7 @@ Obsoletes: %{pkg_name}-core < 0.10-5 This meta-package allows running the default basic upstream xmonad configuration with xterm and dmenu. -If you want to customize xmonad, please install xmonad or xmonad-gnome. +If you want to customize xmonad, please install xmonad or xmonad-mate. %package core @@ -83,7 +82,7 @@ Requires: xorg-x11-apps This package just provides the core xmonad window manager program. To run the default xmonad configuration you should install xmonad-basic. -If you want to customize xmonad please install either xmonad or xmonad-gnome. +If you want to customize xmonad please install either xmonad or xmonad-mate. %package config @@ -96,18 +95,19 @@ Requires: ghc-xmonad-contrib-devel This package provides a basic desktop configuration for xmonad. -%package gnome -Summary: xmonad GNOME session +%package mate +Summary: xmonad MATE session Requires: %{pkg_name}-config = %{version}-%{release} -Requires: gnome-session, gnome-terminal -Requires: gnome-panel, gnome-settings-daemon +Requires: mate-session-manager, mate-terminal +Requires: mate-panel, mate-settings-daemon +Obsoletes: xmonad-gnome < 0.11-3 -%description gnome +%description mate %{common_description} -This package adds a "xmonad-gnome" X session configuration +This package adds a "xmonad-mate" X session configuration so that xmonad can be started easily from GDM to run -in a GNOME session. +in a MATE session. %prep @@ -126,8 +126,7 @@ install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 install -p -m 0644 -D %SOURCE1 %{buildroot}%{_datadir}/xsessions/%{name}.desktop install -p -m 0755 -D %SOURCE2 %{buildroot}%{_bindir}/%{name}-start desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3} -install -p -m 0644 -D %SOURCE5 %{buildroot}%{_datadir}/xsessions/%{name}-gnome.desktop -install -p -m 0644 -D %SOURCE6 %{buildroot}%{_datadir}/gnome-session/sessions/%{name}.session +install -p -m 0644 -D %SOURCE5 %{buildroot}%{_datadir}/xsessions/%{name}-mate.desktop install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.{hs,1,1.html} @@ -168,9 +167,8 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE %{_datadir}/xmonad/xmonad.hs -%files gnome -%{_datadir}/xsessions/%{name}-gnome.desktop -%{_datadir}/gnome-session/sessions/%{name}.session +%files mate +%{_datadir}/xsessions/%{name}-mate.desktop %ghc_files LICENSE @@ -178,6 +176,12 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE %changelog +* Mon Feb 25 2013 Jens Petersen - 0.11-3 +- xmonad-gnome subpackage renamed to xmonad-mate + since gnome-panel in f19 is gone +- corresponding renamings from gnome to mate +- forward-port xmonad-start arg from f16 + * Wed Jan 30 2013 Jens Petersen - 0.11-2 - try to start gnome-screensaver for gnome sessions (#902850)