diff --git a/hackedbox.spec b/hackedbox.spec
index 94ccfd1..31de889 100644
--- a/hackedbox.spec
+++ b/hackedbox.spec
@@ -1,10 +1,10 @@
-# $Id: hackedbox.spec,v 1.5 2005/04/01 14:11:57 mschwendt Exp $
+# $Id: hackedbox.spec,v 1.6 2006/02/09 15:01:59 thias Exp $
# Authority: matthias
Summary: The bastard son of Blackbox, a small and fast Window Manager
Name: hackedbox
Version: 0.8.4
-Release: 4
+Release: 5%{?dist}
License: GPL
Group: User Interface/Desktops
URL: http://scrudgeware.org/projects/Hackedbox
@@ -12,7 +12,13 @@ Source: http://scrudgeware.org/downloads/hackedbox/hackedbox-%{version}.tar.gz
Source1: hackedbox.desktop
Patch: blackbox-0.65.0-gcc34.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: XFree86-devel, libstdc++-devel, gcc-c++, perl
+BuildRequires: gcc-c++, perl
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXt-devel, libXext-devel
+%endif
%description
Hackedbox is a stripped down version of Blackbox - The X11 Window Manager.
@@ -27,8 +33,7 @@ add any functionality, only bugfixes and speed enhancements whenever possible.
%build
-%configure \
- --x-libraries="%{_prefix}/X11R6/%{_lib}"
+%configure
%{__make} %{?_smp_mflags}
@@ -36,7 +41,7 @@ add any functionality, only bugfixes and speed enhancements whenever possible.
%{__rm} -rf %{buildroot}
%makeinstall
-# Install Session file
+# Install GDM session file
%{__mkdir_p} %{buildroot}/etc/X11/gdm/Sessions
%{__cat} > %{buildroot}/etc/X11/gdm/Sessions/Hackedbox << EOF
#!/bin/sh
@@ -47,7 +52,7 @@ EOF
%{__perl} -pi -e 's|/local||g' %{buildroot}%{_datadir}/%{name}/menu
# Install the desktop entry
-%{__install} -m 644 -D %{SOURCE1} \
+%{__install} -D -p -m 644 %{SOURCE1} \
%{buildroot}%{_datadir}/xsessions/%{name}.desktop
@@ -75,6 +80,9 @@ EOF
%changelog
+* Thu Feb 9 2006 Matthias Saou 0.8.4-5
+- Rebuild for new gcc/glibc and modular X.
+
* Fri Apr 1 2005 Michael Schwendt 0.8.4-4
- Include hackedbox datadir.