rpms/netcdf/devel netcdf-4.1.1-hdf5.patch, NONE, 1.1 netcdf.spec, 1.49, 1.50

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24553/devel

Modified Files:
	netcdf.spec 
Added Files:
	netcdf-4.1.1-hdf5.patch 
Log Message:
* Mon Apr 19 2010 Orion Poplawski <orion at cora.nwra.com> - 4.1.1-3
- Explicitly link libnetcdf.so against -lhdf5_hl -lhdf5


netcdf-4.1.1-hdf5.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netcdf-4.1.1-hdf5.patch ---
diff -up netcdf-4.1.1/libsrc4/Makefile.in.hdf5 netcdf-4.1.1/libsrc4/Makefile.in
--- netcdf-4.1.1/libsrc4/Makefile.in.hdf5	2010-04-19 09:44:45.333650779 -0600
+++ netcdf-4.1.1/libsrc4/Makefile.in	2010-04-19 09:44:45.338649501 -0600
@@ -886,7 +886,7 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libnetcdf.la: $(libnetcdf_la_OBJECTS) $(libnetcdf_la_DEPENDENCIES) 
-	$(libnetcdf_la_LINK) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) $(LIBS)
+	$(libnetcdf_la_LINK) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) -lhdf5_hl -lhdf5 $(LIBS)
 
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \


Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- netcdf.spec	9 Apr 2010 21:20:57 -0000	1.49
+++ netcdf.spec	19 Apr 2010 17:47:36 -0000	1.50
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        4.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -10,6 +10,8 @@ Source0:        http://www.unidata.ucar.
 #Use pkgconfig in nc-config to avoid multi-lib issues
 Patch0:         netcdf-4.1-beta2-pkgconfig.patch
 Patch1:         netcdf-4.1.1-fflags.patch
+#Explicitly link libnetcdf.so agains -lhdf5_hl -lhdf5, reported upstream
+Patch2:         netcdf-4.1.1-hdf5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, gawk
@@ -76,6 +78,7 @@ This package contains the netCDF static 
 %setup -q
 %patch0 -p1 -b .pkgconfig
 %patch1 -p1 -b .fflags
+%patch2 -p1 -b .hdf5
 
 
 %build
@@ -158,6 +161,9 @@ fi
 
 
 %changelog
+* Mon Apr 19 2010 Orion Poplawski <orion at cora.nwra.com> - 4.1.1-3
+- Explicitly link libnetcdf.so against -lhdf5_hl -lhdf5
+
 * Fri Apr 9 2010 Orion Poplawski <orion at cora.nwra.com> - 4.1.1-2
 - Add patch to cleanup nc-config --fflags