[dx/el6] unbreak netcdf detection in configure

[Dominik Mierzejewski]

commit f473307dd82d9b1a4f6ce1ab5af9762a3523022b
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Tue Oct 11 18:46:38 2011 +0200

    unbreak netcdf detection in configure
    
    Remove a hunk from Fedora patch that changed netcdf header search path.
    Add missing libXmu-devel BR.

 dx-rpm.patch |    9 ---------
 dx.spec      |    7 ++++++-
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/dx-rpm.patch b/dx-rpm.patch
index 202db77..1befc22 100644
--- a/dx-rpm.patch
+++ b/dx-rpm.patch
@@ -170,15 +170,6 @@ diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac
  	LIBS="$LIB_HDF $LIBS"
  	FMT_LIBS="$FMT_LIBS libdf.a"
  	AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries])
-@@ -766,7 +767,7 @@ then
-     AS_MESSAGE([checking for NETCDF support ......])
-     failed=0;
-     passed=0;
--    AC_CHECK_HEADER(netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
-+    AC_CHECK_HEADER(netcdf/netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
-     AC_CHECK_LIB(netcdf,nc_copy_att,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-     AC_MSG_CHECKING(if NETCDF package is complete)
-     if test $passed -gt 0
 @@ -801,6 +802,9 @@ then
  
      failed=0;
diff --git a/dx.spec b/dx.spec
index 7c9718e..0f3ed1c 100644
--- a/dx.spec
+++ b/dx.spec
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
-Release: 11%{?dist}.2
+Release: 11%{?dist}.3
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.informatics.jax.org/source/dx-%{version}.tar.gz
@@ -29,6 +29,7 @@ BuildRequires: libGLU-devel
 BuildRequires: libtool
 BuildRequires: libXinerama-devel
 BuildRequires: libXpm-devel
+BuildRequires: libXmu-devel
 BuildRequires: netcdf-devel
 BuildRequires: openssh-clients
 Requires: openssh-clients
@@ -128,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Oct 11 2011 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-11.3
+- fix NetCDF detection (broken by the patch imported from Fedora branch)
+- add missing libXmu-devel BR
+
 * Sun Nov 08 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-11.2
 - rebuild with the correct patch applied