rpms/grads/devel grads.spec,1.31,1.32

[Deji Akingunola]

Author: deji

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

Modified Files:
	grads.spec 
Log Message:
* Wed Apr 28 2010 Deji Akingunola <dakingun at gmail.com> - 2.0.a8-0.1
- Update to 2.0.a8



Index: grads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grads/devel/grads.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- grads.spec	8 Dec 2009 21:53:06 -0000	1.31
+++ grads.spec	26 Jul 2010 01:58:11 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           grads
-Version:        2.0.a7.1
-Release:        0.3%{?dist}
+Version:        2.0.a8
+Release:        0.1%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -17,15 +17,16 @@ Source2:        grads-copyright_summary
 # README telling to turn BackingStore true
 Source3:        grads-README.xorg
 Source4:        geotiff.m4
-Patch0:		grads-find-geotiff.patch
+Source5:        hdf5.m4
+Patch0:		grads-find-system-libs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  hdf-static hdf-devel
+BuildRequires:  hdf-static hdf-devel hdf5-devel
 BuildRequires:  g2clib-static g2clib-devel
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
-BuildRequires:  libnc-dap-devel
+BuildRequires:  libnc-dap-devel shapelib-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel libgeotiff-devel
 BuildRequires:  ncurses-devel libpng-devel
 BuildRequires:  libXmu-devel libX11-devel libsx-devel
@@ -45,18 +46,22 @@ commonly used operating systems and is f
 
 %prep
 %setup -q
-%patch0 -p0 -b .geotiff
+%patch0 -p0 -b .sys
 # change path to datas to %{_datadir}/%{name}
 sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gxsubs.c
 cp -p %{SOURCE2} .
 # README for use with xorg
 cp -p %{SOURCE3} README.xorg
-cp -p %{SOURCE4} m4/
+cp -p %{SOURCE4} %{SOURCE5} m4/
 autoreconf -f -i
 
 %build
 #./bootstrap
-%configure --enable-dyn-supplibs --without-gui --with-geotiff LDFLAGS="-L%{_libdir}/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/ -I%{_includedir}/netcdf/ -I%{_includedir}/hdf/"
+%configure --enable-dyn-supplibs			\
+	--without-gui --with-geotiff --with-sdf		\
+	--with-netcdf-include=%{_includedir} --with-netcdf-libdir=%{_libdir}\
+	LDFLAGS="-L%{_libdir}/hdf/"	\
+	CPPFLAGS="-I%{_includedir}/hdf -I%{_includedir}/libshp"
 
 make %{?_smp_mflags}
 
@@ -81,7 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYRIGHT __dist_docs/html README.xorg grads-copyright_summary
 %{_bindir}/bufrscan
 %{_bindir}/grads
-%{_bindir}/gradsdap
 %{_bindir}/gribmap
 %{_bindir}/grib2scan
 %{_bindir}/gribscan
@@ -95,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 28 2010 Deji Akingunola <dakingun at gmail.com> - 2.0.a8-0.1
+- Update to 2.0.a8
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.a7.1-0.3
 - Same as below with hdf-static.
 - Explicitly BR g2clib-static in accordance with the Packaging