rpms/wgrib2/devel wgrib2-1.7.8g-flags.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wgrib2.spec, 1.4, 1.5 wgrib2-1.7.7.i-flags.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/wgrib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17858

Modified Files:
	.cvsignore sources wgrib2.spec 
Added Files:
	wgrib2-1.7.8g-flags.patch 
Removed Files:
	wgrib2-1.7.7.i-flags.patch 
Log Message:
* Fri Apr 10 2009 Orion Poplawski <orion at cora.nwra.com> - 1.7.8g-1
- Update to 1.7.8g
- Fix up flags patch to preserve CFLAGS from environment


wgrib2-1.7.8g-flags.patch:

--- NEW FILE wgrib2-1.7.8g-flags.patch ---
--- grib2/wgrib2/makefile.flags	2009-02-19 09:49:45.000000000 -0700
+++ grib2/wgrib2/makefile	2009-04-10 12:08:02.000000000 -0600
@@ -57,12 +57,12 @@
 options=$(wildcard [A-Z]*.c)
 CODE_TABLE_DAT=$(wildcard CodeTable_[0-9].[0-9]*.dat)
 
-CFLAGS=-I${g2} ${netcdf_inc} ${jasper_inc} ${mysql_inc} -O2 ${DEFS}
+CFLAGS+=-I${g2} ${netcdf_inc} ${jasper_inc} ${mysql_inc} -O2 ${DEFS}
+CFLAGS+=${netcdf_inc} ${DEFS}
 ifeq ($(CC),gcc) 
    CFLAGS+=-Wall -ffast-math -funroll-loops
 endif
-
-LDFLAGS=-L${g2} -lgrib2c ${jasper_lib} ${netcdf_lib} ${mysql_lib} -L/usr/lib -lpng -lz -lm 
+LDFLAGS=-lgrib2c -ljasper -lnetcdf -lpng -lz -lm
 
 wgrib2: $h ${all}
 	${CC} -o wgrib2 ${CFLAGS} ${all} ${LDFLAGS}








--- wgrib2-1.7.7.i-flags.patch DELETED ---