rpms/dx/F-13 dx-rpm.patch,1.5,1.6 dx.spec,1.20,1.21

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/dx/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26924

Modified Files:
	dx-rpm.patch dx.spec 
Log Message:
* Sat Feb 27 2010 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-15
- fix netcdf detection (headers are back in /usr/include),
  drop unnecessary patch hunk (rhbz #569066)


dx-rpm.patch:
 bin/Makefile.am                         |    2 -
 bin/dx.in                               |   34 ++++++++++++++++----------------
 bin/mdf2c.in                            |    2 -
 bin/url_handler.sh                      |    4 +--
 configure.ac                            |   18 ++++++++++------
 doc/Makefile.am                         |    2 -
 fonts/Makefile.am                       |    2 -
 help/Makefile.am                        |    6 ++---
 html/Makefile.am                        |    2 -
 html/images/Makefile.am                 |    2 -
 html/pages/Makefile.am                  |    2 -
 include/Makefile.am                     |    2 -
 include/dx/Makefile.am                  |    2 -
 lib/Makefile.am                         |    2 -
 man/Makefile.am                         |    2 -
 man/manl/Makefile.am                    |    2 -
 src/exec/Makefile.am                    |    2 -
 src/exec/dxexec/Makefile.am             |    2 -
 src/exec/dxmods/Makefile.am             |    5 +++-
 src/exec/dxmods/local.mk.in             |   18 ++++++++--------
 src/exec/libdx/Makefile.am              |    2 -
 src/exec/libdx/memory.c                 |    1 
 src/misc/Makefile.am                    |    4 +--
 src/uipp/dxl/Makefile.am                |    2 -
 src/uipp/dxui/Makefile.am               |    2 -
 src/uipp/java/Makefile.am               |    6 ++---
 src/uipp/java/server/Makefile.am        |    6 ++---
 src/uipp/java/server/macros/Makefile.am |    2 -
 src/uipp/mb/Makefile.am                 |    2 -
 src/uipp/prompter/Makefile.am           |    2 -
 src/uipp/startup/Makefile.am            |    2 -
 src/uipp/tutor/Makefile.am              |    2 -
 src/uipp/ui/Makefile.am                 |    2 -
 33 files changed, 77 insertions(+), 71 deletions(-)

Index: dx-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dx/F-13/dx-rpm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- dx-rpm.patch	6 Nov 2009 11:23:49 -0000	1.5
+++ dx-rpm.patch	27 Feb 2010 23:45:17 -0000	1.6
@@ -170,15 +170,6 @@ diff -up dx-4.4.4/configure.ac.r dx-4.4.
  	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;


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/F-13/dx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- dx.spec	26 Feb 2010 22:33:25 -0000	1.20
+++ dx.spec	27 Feb 2010 23:45:17 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer
 Name: dx
 Version: 4.4.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.informatics.jax.org/source/dx-%{version}.tar.gz
@@ -131,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Sat Feb 27 2010 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-15
+- fix netcdf detection (headers are back in /usr/include),
+  drop unnecessary patch hunk (rhbz #569066)
+
 * Fri Feb 26 2010 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-14
 - fix FTBFS due to calls to non-public function from ImageMagick