rpms/wgrib2/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wgrib2.spec, 1.6, 1.7 wgrib2-1.7.8g-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-serv16581

Modified Files:
	.cvsignore sources wgrib2.spec 
Removed Files:
	wgrib2-1.7.8g-flags.patch 
Log Message:
* Thu Jul 16 2009 Orion Poplawski <orion at cora.nwra.com> - 1.7.8j-1
- Update to 1.7.8j
- Drop flags patch, can now pass flags to make



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Apr 2009 18:22:44 -0000	1.4
+++ .cvsignore	16 Jul 2009 22:04:12 -0000	1.5
@@ -1 +1 @@
-wgrib2.tgz.v1.7.8g
+wgrib2.tgz.v1.7.8j


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Apr 2009 18:22:44 -0000	1.4
+++ sources	16 Jul 2009 22:04:12 -0000	1.5
@@ -1 +1 @@
-892f49621e19c9d9e43e0a72a2fa161c  wgrib2.tgz.v1.7.8g
+f4625d0b3b6b276a7ee256bb31aa04d5  wgrib2.tgz.v1.7.8j


Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/wgrib2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- wgrib2.spec	10 Apr 2009 18:23:17 -0000	1.6
+++ wgrib2.spec	16 Jul 2009 22:04:13 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           wgrib2
-Version:        1.7.8g
+Version:        1.7.8j
 Release:        1%{?dist}
 Summary:        Manipulate, inventory and decode GRIB2 files
 
@@ -8,9 +8,6 @@ Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/
 Source0:        ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v%{version}
-#Upstream makefile doesn't allow you to add flags, points to local library
-#versions.  This patch fixes that.
-Patch0:         wgrib2-1.7.8g-flags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  g2clib-devel, zlib-devel, netcdf-devel
@@ -24,13 +21,13 @@ extract data. You can do basic database 
 %setup -q -n grib2
 rm -r g2clib-* jasper-*.tar.gz libpng-*.tar.gz \
   zlib-*.tar.gz netcdf.tar.gz
-%patch0 -p1 -b .flags
 
 
 %build
 cd wgrib2
-export CFLAGS="$RPM_OPT_FLAGS"
-make %{?_smp_mflags} netcdf_inc="-I%{_includedir}/netcdf"
+export CFLAGS="-I/usr/include/netcdf $RPM_OPT_FLAGS"
+export LDFLAGS="-lgrib2c -ljasper -lnetcdf -lpng -lz -lm"
+make %{?_smp_mflags}
 
 
 %install
@@ -50,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 16 2009 Orion Poplawski <orion at cora.nwra.com> - 1.7.8j-1
+- Update to 1.7.8j
+- Drop flags patch, can now pass flags to make
+
 * 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 DELETED ---