From c000a76a2aae89754c65e6c514b7a9bff7144191 Mon Sep 17 00:00:00 2001
From: Peter Gordon <pgordon@fedoraproject.org>
Date: Thu, 29 Jun 2006 03:12:50 +0000
Subject: [PATCH] Unconditionalize the BuildRequires on a per-branch basis.
---
openbox.spec | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/openbox.spec b/openbox.spec
index f02fec7..58921ee 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
%define ob_version 3.3
%define ob_pre_tag rc2
-%define pkg_release 7
+%define pkg_release 8
%define ob_tarball_version %{ob_version}%{?ob_pre_tag:-%{ob_pre_tag}}
Name: openbox
@@ -22,16 +22,9 @@ BuildRequires: gettext
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
BuildRequires: libxml2-devel
-
-# Default to modular X.org if on FC5 or higher...
-%if "%{?fedora}" >= "5"
BuildRequires: libXt-devel
BuildRequires: libXrandr-devel
BuildRequires: libXinerama-devel
-# ...and monolithic X.org otherwise.
-%else
-BuildRequires: xorg-x11-devel
-%endif
%description
Openbox is a window manager designed explicity for standards-compliance and
@@ -113,6 +106,10 @@ rm -rf %{buildroot}
%changelog
+* Wed Jun 28 2006 Peter Gordon <peter@thecodergeek.com> - 3.3-0.8.rc2
+- Unconditionalize the BuildRequires for modular X.org, since it's branched
+ for a specific Fedora release.
+
* Mon Jun 26 2006 Peter Gordon <peter@thecodergeek.com> - 3.3-0.7.rc2
- Own the %%{_datadir}/gnome/wm-properties directory (#195292)