[xmonad] update to 0.11 release
Jens Petersen
petersen at fedoraproject.org
Fri Jan 18 09:17:38 UTC 2013
commit 1aa12d6f4338d441443e3cea21e991602ea1092d
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jan 18 18:17:27 2013 +0900
update to 0.11 release
.gitignore | 1 +
README.fedora | 11 +-
sources | 2 +-
...KE_FOCUS-track-currently-processing-event.patch | 105 --------------------
xmonad-0.10-X11-1.6.patch | 12 ---
xmonad.spec | 21 ++--
6 files changed, 19 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68c2510..b3d59b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
xmonad-0.9.1.tar.gz
/xmonad-0.9.2.tar.gz
/xmonad-0.10.tar.gz
+/xmonad-0.11.tar.gz
diff --git a/README.fedora b/README.fedora
index c4237b3..5ce215d 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,7 +1,7 @@
= Packaging =
-xmonad in Fedora is provided by 3 packages:
+xmonad in Fedora is provided by 3 subpackages:
-- xmonad-core: just the base window manager and X session files
+- 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
@@ -17,12 +17,13 @@ To activate the gnome-panel menu use Alt+Super+Button3 or Alt+Button3.
= xmonad-start =
For new users without "~/.xmonad/", Fedora's xmonad-start script
-displays "man xmonad" in an xterm to provide help initially.
+displays "man xmonad" in a terminal to provide help initially.
To stop this behaviour, just create "~/.xmonad/".
-With the xmonad-gnome or xmonad packages installed, xmonad-start will create
-a basic "~/.xmonad/xmonad.hs" file configured for desktops.
+With the xmonad, xmonad-config, or xmonad packages installed,
+xmonad-start will create a basic "~/.xmonad/xmonad.hs" file
+configured for desktops.
= Configuration references =
- xmonad man-page
diff --git a/sources b/sources
index 4b3d05c..0452b4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8381e1ec15137863558a454d4466467 xmonad-0.10.tar.gz
+5ac9dc1dae5e85dcbdfb9f70cbe312c1 xmonad-0.11.tar.gz
diff --git a/xmonad.spec b/xmonad.spec
index 6a46a81..cd840ae 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -16,8 +16,8 @@ workspace. Xinerama is fully supported, allowing windows to be tiled\
on several screens.
Name: %{pkg_name}
-Version: 0.10
-Release: 17%{?dist}
+Version: 0.11
+Release: 1%{?dist}
Summary: A tiling window manager
License: BSD
@@ -30,8 +30,6 @@ Source4: README.fedora
Source5: xmonad-gnome-session.desktop
Source6: xmonad.session
Source7: xmonad.hs
-Patch1: xmonad-0.10-X11-1.6.patch
-Patch2: xmonad-0.10-WM_TAKE_FOCUS-track-currently-processing-event.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -114,8 +112,6 @@ in a GNOME session.
%prep
%setup -q
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
cp -p %SOURCE4 .
@@ -132,9 +128,9 @@ 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 %SOURCE7 %{buildroot}%{_datadir}/xmonad/%{name}.hs
+install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs
-rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
+rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.{hs,1,1.html}
# ship LICENSE in xmonad-core
rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
@@ -160,7 +156,8 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
%files core
-%doc CONFIG LICENSE README man/%{name}.hs README.fedora
+%doc CONFIG LICENSE README README.fedora
+%doc man/xmonad.{hs,1{.html,.markdown}}
%attr(755,root,root) %{_bindir}/%{name}
%attr(755,root,root) %{_bindir}/%{name}-start
%{_mandir}/man1/%{name}.1*
@@ -168,7 +165,7 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
%files config
-%{_datadir}/xmonad/%{name}.hs
+%{_datadir}/xmonad/xmonad.hs
%files gnome
@@ -181,6 +178,10 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
%changelog
+* Fri Jan 18 2013 Jens Petersen <petersen at redhat.com> - 0.11-1
+- update to 0.11
+- X11-1.6 and WM_TAKE_FOCUS patches no longer needed
+
* Thu Dec 13 2012 Jens Petersen <petersen at redhat.com> - 0.10-17
- xmonad-gnome now requires gnome-panel and gnome-settings-daemon to start
More information about the scm-commits
mailing list