[grads/f14/master] - Update to 2.0.a9 - Remove upstreamed patches
Deji Akingunola
deji at fedoraproject.org
Fri Sep 3 17:16:04 UTC 2010
commit 76877d6c4d70d1c4dc9f79d66cc985ac649631b1
Author: Deji Akingunola <dakingun at gmail.com>
Date: Fri Sep 3 13:17:57 2010 -0400
- Update to 2.0.a9
- Remove upstreamed patches
geotiff.m4 | 169 ------------------------------------------
grads-find-system-libs.patch | 92 ++---------------------
grads.spec | 38 +++++-----
hdf5.m4 | 155 --------------------------------------
sources | 2 +-
5 files changed, 25 insertions(+), 431 deletions(-)
---
diff --git a/grads-find-system-libs.patch b/grads-find-system-libs.patch
index 749955a..f301b66 100644
--- a/grads-find-system-libs.patch
+++ b/grads-find-system-libs.patch
@@ -1,26 +1,11 @@
---- configure.ac 2010-03-26 10:06:25.000000000 -0400
-+++ configure.ac.new 2010-04-27 15:51:26.354116875 -0400
-@@ -383,6 +383,16 @@
- fi
- fi
- # if we haven't got what we need, add a macro to look outside supplibs
-+ if test $use_geotiff != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
-+ echo
-+ echo "Checking in system locations for libraries to support geotiff ..."
-+ AC_CHECK_GEOTIFF([
-+ LDFLAGS="$LDFLAGS $GEOTIFF_LDFLAGS"
-+ geotiff_libs="$GEOTIFF_LIBS"
-+ geotiff_inc=$GEOTIFF_CFLAGS
-+ use_geotiff='yes'
-+ ])
-+ fi
- fi
- if test "$use_geotiff" != "yes" ; then
- AC_DEFINE(GEOTIFF, 0, [Enable geotiff])
-@@ -411,6 +421,17 @@
+--- configure.ac 2010-08-30 13:21:31.000000000 -0400
++++ configure.ac.new 2010-09-03 10:34:44.860929508 -0400
+@@ -429,7 +429,18 @@
+ ])
GA_UNSET_FLAGS
fi
- # if we haven't got what we need, add a macro to look outside supplibs
+- # here's where we could add a macro to look outside supplibs for shapelib
++ # look outside supplibs for shapelib
+ if test "$use_shp" != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
+ echo
+ echo "Checking in system locations for libraries to support shapefiles ..."
@@ -35,68 +20,3 @@
fi
if test "$use_shp" != "yes" ; then
AC_DEFINE(USESHP, 0, [Enable shapefile])
-@@ -665,6 +686,17 @@
- fi
- fi
- # here's where you would add code for looking outside of supplibs
-+ if test $use_hdf5 != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
-+ echo
-+ echo "Checking in system locations for libraries to support hdf5 ..."
-+ AC_CHECK_HDF5([
-+ LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
-+ hdf5_libs="$HDF5_LIBS"
-+ hdf5_inc=$HDF5_CFLAGS
-+ use_hdf5='yes'
-+ ])
-+ fi
-+
- if test $use_hdf5 != "yes" ; then
- AC_DEFINE(USEHDF5, 0, [Enable hdf5])
- echo "- hdf5 disabled"
-@@ -704,21 +736,34 @@
- ])
- ])
- GA_UNSET_FLAGS
-+ AC_SUBST(nc_inc)
-+ AC_SUBST(nc_libs)
-+ NC_CONFIG=${ga_supplib_dir}/bin/nc-config
- fi
- fi
- # here's where you would add code for looking outside of supplibs
-+ if test $use_nc4 != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
-+ GA_CHECK_UDUNITS(
-+ [ AC_CHECK_NETCDF(
-+ [ use_nc4=yes
-+ LDFLAGS="$LDFLAGS $NC_LDFLAGS"
-+ nc_libs="$NC_LIBS $UDUNITS_LIBS"
-+ nc_inc="$NC_CFLAGS $UDUNITS_CFLAGS"
-+ ],,
-+ [])
-+ ])
-+ NC_CONFIG="`pkg-config --variable=prefix netcdf`/bin/nc-config"
-+ fi
-+
- if test $use_nc4 != "yes" ; then
- AC_DEFINE(USENETCDF, 0, [Enable netcdf])
- AC_DEFINE(HAVENETCDF4, 0, [Enable netcdf4])
- echo "- netcdf-4 disabled"
- else
-- AC_SUBST(nc_inc)
-- AC_SUBST(nc_libs)
- AC_DEFINE(USENETCDF, 1, [Enable netcdf])
- AC_DEFINE(HAVENETCDF4, 1, [Enable netcdf4])
- echo "+ netcdf-4 enabled"
- # find out if it is dap-enabled
-- NC_CONFIG=${ga_supplib_dir}/bin/nc-config
- use_dap=`$NC_CONFIG --has-dap`
- if test $use_dap = "yes" ; then
- AC_DEFINE(USEDAP, 1, [Enable OPeNDAP for grids])
---- aclocal.m4 2010-03-08 09:54:40.000000000 -0500
-+++ aclocal.m4.new 2010-04-27 14:22:05.295832365 -0400
-@@ -633,4 +633,6 @@
- m4_include([m4/netcdf_header.m4])
- m4_include([m4/pkg.m4])
- m4_include([m4/udunits.m4])
-+m4_include([m4/geotiff.m4])
-+m4_include([m4/hdf5.m4])
- m4_include([acinclude.m4])
diff --git a/grads.spec b/grads.spec
index a112d59..f0fc14b 100644
--- a/grads.spec
+++ b/grads.spec
@@ -1,5 +1,5 @@
Name: grads
-Version: 2.0.a8
+Version: 2.0.a9
Release: 0.1%{?dist}
Summary: Tool for easy acces, manipulation, and visualization of data
@@ -8,27 +8,22 @@ Group: Applications/Engineering
License: GPLv2 and MIT
URL: http://grads.iges.org/grads/grads.html
-# original tarball contains non free code
-#Source0: ftp://grads.iges.org/grads/1.9/grads-src-%{version}.tar.gz
-Source0: grads-%{version}-src.tar.gz
+Source0: ftp://iges.org/grads/2.0/grads-%{version}-src.tar.gz
# Copyrights explanation
-Source2: grads-copyright_summary
+Source1: grads-copyright_summary
# README telling to turn BackingStore true
-Source3: grads-README.xorg
-Source4: geotiff.m4
-Source5: hdf5.m4
+Source2: grads-README.xorg
+
Patch0: grads-find-system-libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: hdf-static hdf-devel hdf5-devel
-BuildRequires: g2clib-static g2clib-devel
-BuildRequires: udunits-devel netcdf-devel
-BuildRequires: readline-devel
-BuildRequires: libnc-dap-devel shapelib-devel
-BuildRequires: zlib-devel libjpeg-devel gd-devel libgeotiff-devel
-BuildRequires: ncurses-devel libpng-devel
+BuildRequires: hdf-static hdf-devel hdf5-devel netcdf-devel
+BuildRequires: g2clib-static g2clib-devel udunits-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: shapelib-devel gd-devel libgeotiff-devel libnc-dap-devel
+BuildRequires: zlib-devel libjpeg-devel libpng-devel
BuildRequires: libXmu-devel libX11-devel libsx-devel
BuildRequires: pkgconfig
BuildRequires: automake
@@ -49,16 +44,15 @@ commonly used operating systems and is freely distributed over the Internet.
%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} .
+cp -p %{SOURCE1} .
# README for use with xorg
-cp -p %{SOURCE3} README.xorg
-cp -p %{SOURCE4} %{SOURCE5} m4/
+cp -p %{SOURCE2} README.xorg
autoreconf -f -i
%build
#./bootstrap
-%configure --enable-dyn-supplibs \
- --without-gui --with-geotiff --with-sdf \
+%configure --enable-dyn-supplibs \
+ --without-gui --with-geotiff --with-sdf --with-shp \
--with-netcdf-include=%{_includedir} --with-netcdf-libdir=%{_libdir}\
LDFLAGS="-L%{_libdir}/hdf/" \
CPPFLAGS="-I%{_includedir}/hdf -I%{_includedir}/libshp"
@@ -99,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 03 2010 Deji Akingunola <dakingun at gmail.com> - 2.0.a9-0.1
+- Update to 2.0.a9
+- Remove upstreamed patches
+
* Wed Apr 28 2010 Deji Akingunola <dakingun at gmail.com> - 2.0.a8-0.1
- Update to 2.0.a8
diff --git a/sources b/sources
index 65eb441..2ed80b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22c45ada417fefc1dfe408a4c3093f90 grads-2.0.a8-src.tar.gz
+2009b3937d1754b173714b133339eb74 grads-2.0.a9-src.tar.gz
More information about the scm-commits
mailing list