rpms/wgrib2/EL-5 wgrib2-1.7.2-flags.patch, 1.1, 1.2 wgrib2.spec, 1.2, 1.3

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/wgrib2/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27650

Modified Files:
	wgrib2-1.7.2-flags.patch wgrib2.spec 
Log Message:
Fix netcdf-3 library location on EL

wgrib2-1.7.2-flags.patch:

Index: wgrib2-1.7.2-flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/EL-5/wgrib2-1.7.2-flags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wgrib2-1.7.2-flags.patch	20 May 2008 15:47:08 -0000	1.1
+++ wgrib2-1.7.2-flags.patch	20 May 2008 16:54:41 -0000	1.2
@@ -7,7 +7,7 @@
 -CFLAGS=-I${g2} ${netcdf_inc} -O2 -Wall -ffast-math -funroll-loops ${DEFS}
 -LDFLAGS=-L${g2} -lgrib2c ${jasper_lib} -ljasper ${netcdf_lib} -lnetcdf -L/usr/lib -lpng -lz -lm 
 +CFLAGS+=${netcdf_inc} ${DEFS}
-+LDFLAGS=-lgrib2c -ljasper -lnetcdf -lpng -lz -lm 
++LDFLAGS=-lgrib2c -ljasper ${netcdf_lib} -lnetcdf -lpng -lz -lm 
  #CC=gcc
  
  wgrib2: $h ${all}


Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/EL-5/wgrib2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wgrib2.spec	20 May 2008 16:37:24 -0000	1.2
+++ wgrib2.spec	20 May 2008 16:54:41 -0000	1.3
@@ -30,7 +30,8 @@
 %build
 cd wgrib2
 export CFLAGS="$RPM_OPT_FLAGS"
-make %{?_smp_mflags} netcdf_inc="-I%{_includedir}/netcdf-3"
+make %{?_smp_mflags} netcdf_inc="-I%{_includedir}/netcdf-3" \
+                     netcdf_lib="-L%{_libdir}/netcdf-3"
 
 
 %install