rpms/wgrib2/devel config.h, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wgrib2.spec, 1.8, 1.9

Orion Poplawski orion at fedoraproject.org
Thu Aug 20 18:23:58 UTC 2009


Author: orion

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

Modified Files:
	.cvsignore sources wgrib2.spec 
Added Files:
	config.h 
Log Message:
* Thu Aug 20 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.0-1
- Update to 1.8.0
- Only ship the wgrib2 source
- Compile with mysql and netcdf4 support



--- NEW FILE config.h ---
/* config.h */
#define USE_REGEX
#define USE_TIGGE
#define USE_NETCDF3
#define USE_NETCDF4
#define USE_MYSQL


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Jul 2009 22:04:12 -0000	1.5
+++ .cvsignore	20 Aug 2009 18:23:58 -0000	1.6
@@ -1 +1 @@
-wgrib2.tgz.v1.7.8j
+wgrib2-1.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	16 Jul 2009 22:04:12 -0000	1.5
+++ sources	20 Aug 2009 18:23:58 -0000	1.6
@@ -1 +1 @@
-f4625d0b3b6b276a7ee256bb31aa04d5  wgrib2.tgz.v1.7.8j
+5f966acef09c2fcc0d19747d8a279cdb  wgrib2-1.8.0.tar.gz


Index: wgrib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wgrib2/devel/wgrib2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- wgrib2.spec	27 Jul 2009 07:13:20 -0000	1.8
+++ wgrib2.spec	20 Aug 2009 18:23:58 -0000	1.9
@@ -1,16 +1,23 @@
 Name:           wgrib2
-Version:        1.7.8j
-Release:        2%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Manipulate, inventory and decode GRIB2 files
 
 Group:          Applications/Engineering
 # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+
 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}
+# To make the Source0 tarball, uncomment this line and comment the second.
+# spectool -g wgrib2.spec
+# make prep
+# tar czf wgrib2-%{version}.tar.gz grib2
+#Source0:        ftp://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v%{version}
+Source0:        wgrib2-%{version}.tar.gz
+Source1:        config.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  g2clib-devel, zlib-devel, netcdf-devel
+BuildRequires:  mysql-devel
 
 %description
 Wgrib2 is a swiss army knife for grib2 files. You can use it inventory or
@@ -19,14 +26,14 @@ extract data. You can do basic database 
 
 %prep
 %setup -q -n grib2
-rm -r g2clib-* jasper-*.tar.gz libpng-*.tar.gz \
-  zlib-*.tar.gz netcdf.tar.gz
+rm -rf g2clib-* *.tar.gz
+cp %SOURCE1 wgrib2/config.h
 
 
 %build
 cd wgrib2
-export CFLAGS="-I/usr/include/netcdf $RPM_OPT_FLAGS"
-export LDFLAGS="-lgrib2c -ljasper -lnetcdf -lpng -lz -lm"
+export CFLAGS="-I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS"
+export LDFLAGS="-lgrib2c -ljasper -lnetcdf -lpng -L%{_libdir}/mysql -lmysqlclient -lz -lm"
 make %{?_smp_mflags}
 
 
@@ -47,6 +54,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Orion Poplawski <orion at cora.nwra.com> -1.8.0-1
+- Update to 1.8.0
+- Only ship the wgrib2 source
+- Compile with mysql and netcdf4 support
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.8j-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list