diff --git a/.gitignore b/.gitignore index 3634652..516cd44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ncl_ncarg_src-5.2.0.tar.gz +ncl_ncarg_src-5.2.1.tar.gz diff --git a/ncl-5.0.0-udunits.patch b/ncl-5.2.1-udunits.patch similarity index 50% rename from ncl-5.0.0-udunits.patch rename to ncl-5.2.1-udunits.patch index 3bb1304..c849918 100644 --- a/ncl-5.0.0-udunits.patch +++ b/ncl-5.2.1-udunits.patch @@ -1,10 +1,11 @@ ---- ncl_ncarg-5.0.0/config/Project.udunits 2008-12-08 15:35:46.000000000 -0700 -+++ ncl_ncarg-5.0.0/config/Project 2008-12-08 15:50:44.000000000 -0700 -@@ -328,7 +328,7 @@ +diff -up ncl_ncarg-5.2.1/config/Project.udunits ncl_ncarg-5.2.1/config/Project +--- ncl_ncarg-5.2.1/config/Project.udunits 2010-08-10 13:01:03.000000000 -0600 ++++ ncl_ncarg-5.2.1/config/Project 2010-08-10 13:02:36.052660865 -0600 +@@ -392,7 +392,7 @@ NGENV_DESCRIPT = \ "graphcaps",NULL,"ncarg",NULL,NULL, \ "colormaps",NULL,"ncarg",NULL,NULL, \ "rangs","NCARG_RANGS","database",NULL,NULL, \ -- "udunits","UDUNITS_PATH","ncarg",NULL,NULL, \ +- "udunits","NCARG_UDUNITS","ncarg",NULL,NULL, \ + "udunits","UDUNITS_PATH",NULL,"/etc","udunits.dat", \ "psadilookup","PSADILOOKUP_PATH",NULL,NULL,NULL,\ "examples",NULL,"ncarg",NULL,NULL, \ diff --git a/ncl.spec b/ncl.spec index c78dc2e..507c587 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -41,7 +41,7 @@ Patch11: ncl-5.0.0-build_n_scripts.patch Patch12: ncl-5.1.0-netcdff.patch Patch13: ncl-5.1.0-includes.patch # Use /etc/udunits.dat -Patch15: ncl-5.0.0-udunits.patch +Patch15: ncl-5.2.1-udunits.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel @@ -310,6 +310,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 10 2010 - Orion Poplawski - 5.2.1-1 +- Update to 5.2.1 +- Update udunits patch + * Thu Jul 1 2010 - Orion Poplawski - 5.2.0-2 - Drop BR libnc-dap and update lib patch to remove unneeded libraries diff --git a/sources b/sources index e77a34c..69149cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ed710647a7eec8f500c7494853a2b65 ncl_ncarg_src-5.2.0.tar.gz +c7ba4847961f38bbbac30ac042eab43a ncl_ncarg_src-5.2.1.tar.gz