From db0317f0fb05132260d9f86eee01fc4bf03c8e37 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Dec 11 2010 02:31:51 +0000
Subject: Merge remote branch 'origin/el5/master'


Conflicts:
	dx-rpm.patch
	dx.spec

---

diff --git a/dx.spec b/dx.spec
index e7fbdfe..3214a7a 100644
--- a/dx.spec
+++ b/dx.spec
@@ -25,7 +25,7 @@ BuildRequires: hdf-static, hdf-devel
 BuildRequires: ImageMagick-devel
 #FIXME doesn't build currently
 #BuildRequires: java-devel
-BuildRequires: lesstif-devel
+BuildRequires: openmotif-devel
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: libtool