[g2clib: 1/2] Update to 1.4.0 Rebase templates patch
Orion Poplawski
orion at fedoraproject.org
Wed Oct 17 03:19:37 UTC 2012
commit 6c79276a78540e6bde518cd270ce45be462840f5
Author: Orion Poplawski <orion at nwra.com>
Date: Tue Oct 16 21:17:23 2012 -0600
Update to 1.4.0
Rebase templates patch
.gitignore | 1 +
g2clib-templates.patch | 127 +++++++++++++++++++++++++++++++++++++++---------
g2clib.spec | 8 ++-
sources | 2 +-
4 files changed, 112 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c061ada..76ff7bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
g2clib-1.2.1.tar
/g2clib-1.2.2.tar
/g2clib-1.2.3.tar
+/g2clib-1.4.0.tar
diff --git a/g2clib-templates.patch b/g2clib-templates.patch
index 9b26962..f3d9f67 100644
--- a/g2clib-templates.patch
+++ b/g2clib-templates.patch
@@ -1,6 +1,6 @@
-diff -up g2clib-1.2.3/drstemplates.c.templates g2clib-1.2.3/drstemplates.c
---- g2clib-1.2.3/drstemplates.c.templates 2011-11-10 11:35:05.000000000 -0700
-+++ g2clib-1.2.3/drstemplates.c 2012-03-09 12:44:49.190332026 -0700
+diff -up g2clib-1.4.0/drstemplates.c.templates g2clib-1.4.0/drstemplates.c
+--- g2clib-1.4.0/drstemplates.c.templates 2012-02-15 06:54:35.000000000 -0700
++++ g2clib-1.4.0/drstemplates.c 2012-10-16 21:08:27.865161369 -0600
@@ -2,6 +2,29 @@
#include "grib2.h"
#include "drstemplates.h"
@@ -31,9 +31,9 @@ diff -up g2clib-1.2.3/drstemplates.c.templates g2clib-1.2.3/drstemplates.c
g2int getdrsindex(g2int number)
/*!$$$ SUBPROGRAM DOCUMENTATION BLOCK
! . . . .
-diff -up g2clib-1.2.3/drstemplates.h.templates g2clib-1.2.3/drstemplates.h
---- g2clib-1.2.3/drstemplates.h.templates 2011-11-10 11:35:05.000000000 -0700
-+++ g2clib-1.2.3/drstemplates.h 2012-03-09 12:47:11.317245964 -0700
+diff -up g2clib-1.4.0/drstemplates.h.templates g2clib-1.4.0/drstemplates.h
+--- g2clib-1.4.0/drstemplates.h.templates 2012-02-15 06:54:35.000000000 -0700
++++ g2clib-1.4.0/drstemplates.h 2012-10-16 21:08:27.866161370 -0600
@@ -42,28 +42,8 @@
g2int mapdrs[MAXDRSMAPLEN];
};
@@ -65,9 +65,9 @@ diff -up g2clib-1.2.3/drstemplates.h.templates g2clib-1.2.3/drstemplates.h
+ g2int getdrsindex(g2int number);
#endif /* _drstemplates_H */
-diff -up g2clib-1.2.3/gridtemplates.c.templates g2clib-1.2.3/gridtemplates.c
---- g2clib-1.2.3/gridtemplates.c.templates 2011-11-10 11:35:05.000000000 -0700
-+++ g2clib-1.2.3/gridtemplates.c 2012-03-09 12:46:16.725199636 -0700
+diff -up g2clib-1.4.0/gridtemplates.c.templates g2clib-1.4.0/gridtemplates.c
+--- g2clib-1.4.0/gridtemplates.c.templates 2012-02-15 06:54:37.000000000 -0700
++++ g2clib-1.4.0/gridtemplates.c 2012-10-16 21:08:27.866161370 -0600
@@ -2,6 +2,62 @@
#include "grib2.h"
#include "gridtemplates.h"
@@ -131,9 +131,9 @@ diff -up g2clib-1.2.3/gridtemplates.c.templates g2clib-1.2.3/gridtemplates.c
g2int getgridindex(g2int number)
/*!$$$ SUBPROGRAM DOCUMENTATION BLOCK
! . . . .
-diff -up g2clib-1.2.3/gridtemplates.h.templates g2clib-1.2.3/gridtemplates.h
---- g2clib-1.2.3/gridtemplates.h.templates 2011-11-10 11:35:05.000000000 -0700
-+++ g2clib-1.2.3/gridtemplates.h 2012-03-09 12:46:52.543918112 -0700
+diff -up g2clib-1.4.0/gridtemplates.h.templates g2clib-1.4.0/gridtemplates.h
+--- g2clib-1.4.0/gridtemplates.h.templates 2012-02-15 06:54:37.000000000 -0700
++++ g2clib-1.4.0/gridtemplates.h 2012-10-16 21:08:27.867161370 -0600
@@ -48,61 +48,8 @@
g2int mapgrid[MAXGRIDMAPLEN];
};
@@ -198,10 +198,10 @@ diff -up g2clib-1.2.3/gridtemplates.h.templates g2clib-1.2.3/gridtemplates.h
+ g2int getgridindex(g2int number);
#endif /* _gridtemplates_H */
-diff -up g2clib-1.2.3/pdstemplates.c.templates g2clib-1.2.3/pdstemplates.c
---- g2clib-1.2.3/pdstemplates.c.templates 2011-11-10 11:35:05.000000000 -0700
-+++ g2clib-1.2.3/pdstemplates.c 2012-03-09 12:49:04.463197056 -0700
-@@ -2,6 +2,95 @@
+diff -up g2clib-1.4.0/pdstemplates.c.templates g2clib-1.4.0/pdstemplates.c
+--- g2clib-1.4.0/pdstemplates.c.templates 2012-07-05 06:55:00.000000000 -0600
++++ g2clib-1.4.0/pdstemplates.c 2012-10-16 21:14:56.852259098 -0600
+@@ -2,6 +2,135 @@
#include "grib2.h"
#include "pdstemplates.h"
@@ -290,17 +290,57 @@ diff -up g2clib-1.2.3/pdstemplates.c.templates g2clib-1.2.3/pdstemplates.c
+ {1100,15,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4} },
+ // 4.1100: Hovmoller-type grid with averaging or other
+ // statistical processing
-+ {1101,22,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,4,1,1,1,4,1,4} }
++ {1101,22,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,4,1,1,1,4,1,4} },
++ // 4.32:Simulate (synthetic) Satellite Product
++ {32,10,1, {1,1,1,1,1,2,1,1,2,1} },
++ // 4.44: Analysis or forecast at a horizontal level or in a horizontal layer
++ // at a point in time for Aerosol
++ {44,21,0, {1,1,2,1,-1,-4,-1,-4,1,1,1,2,1,1,2,1,-1,-4,1,-1,-4} },
++ // 4.45: Individual ensemble forecast, control and
++ // perturbed, at a horizontal level or in a horizontal layer
++ // at a point in time for Aerosol
++ {45,24,0, {1,1,2,1,-1,-4,-1,-4,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1} },
++ // 4.46: Ave or Accum or Extreme value at level/layer
++ // at horizontal level or in a horizontal in a continuous or
++ // non-continuous time interval for Aerosol
++ {46,35,1, {1,1,2,1,-1,-4,-1,-4,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,2,1,1,1,1,1,1,4,1,1,1,4,1,4} },
++ // 4.47: Individual ensemble forecast, control and
++ // perturbed, at horizontal level or in a horizontal
++ // in a continuous or non-continuous time interval for Aerosol
++ {47,38,1, {1,1,1,2,1,-1,-4,-1,-4,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,2,1,1,1,1,1,1,4,1,1,1,4,1,4} },
++
++ // VALIDATION --- PDT 4.48
++ // 4.48: Analysis or forecast at a horizontal level or in a horizontal layer
++ // at a point in time for Optical Properties of Aerosol
++ {48,26,0, {1,1,2,1,-1,-4,-1,-4,1,-1,-4,-1,-4,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4} },
++
++ // VALIDATION --- PDT 4.50
++ // 4.50: Analysis or forecast of multi component parameter or
++ // matrix element at a point in time
++ {50,21,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,4,4,4,4} },
++
++ // VALIDATIONi --- PDT 4.52
++ // 4.52: Analysis or forecast of Wave parameters
++ // at the Sea surface at a point in time
++ {52,15,0, {1,1,1,1,1,1,1,1,2,1,1,4,1,-1,-4} },
++
++ // 4.51: Categorical forecasts at a horizontal level or
++ // in a horizontal layer at a point in time
++ {51,16,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1} },
++ // 4.91: Categorical forecasts at a horizontal level or
++ // in a horizontal layer at a point in time
++ // in a continuous or non-continuous time interval
++ {91,16,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1} }
+
+} ;
+
g2int getpdsindex(g2int number)
///$$$ SUBPROGRAM DOCUMENTATION BLOCK
// . . . .
-diff -up g2clib-1.2.3/pdstemplates.h.templates g2clib-1.2.3/pdstemplates.h
---- g2clib-1.2.3/pdstemplates.h.templates 2011-11-10 11:35:05.000000000 -0700
-+++ g2clib-1.2.3/pdstemplates.h 2012-03-09 12:48:06.644266128 -0700
-@@ -48,94 +48,8 @@
+diff -up g2clib-1.4.0/pdstemplates.h.templates g2clib-1.4.0/pdstemplates.h
+--- g2clib-1.4.0/pdstemplates.h.templates 2012-07-05 06:55:00.000000000 -0600
++++ g2clib-1.4.0/pdstemplates.h 2012-10-16 21:14:43.084255843 -0600
+@@ -51,134 +51,8 @@
g2int mappds[MAXPDSMAPLEN];
};
@@ -389,11 +429,52 @@ diff -up g2clib-1.2.3/pdstemplates.h.templates g2clib-1.2.3/pdstemplates.h
- {1100,15,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4} },
- // 4.1100: Hovmoller-type grid with averaging or other
- // statistical processing
-- {1101,22,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,4,1,1,1,4,1,4} }
+- {1101,22,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,4,1,1,1,4,1,4} },
+- // 4.32:Simulate (synthetic) Satellite Product
+- {32,10,1, {1,1,1,1,1,2,1,1,2,1} },
+- // 4.44: Analysis or forecast at a horizontal level or in a horizontal layer
+- // at a point in time for Aerosol
+- {44,21,0, {1,1,2,1,-1,-4,-1,-4,1,1,1,2,1,1,2,1,-1,-4,1,-1,-4} },
+- // 4.45: Individual ensemble forecast, control and
+- // perturbed, at a horizontal level or in a horizontal layer
+- // at a point in time for Aerosol
+- {45,24,0, {1,1,2,1,-1,-4,-1,-4,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1} },
+- // 4.46: Ave or Accum or Extreme value at level/layer
+- // at horizontal level or in a horizontal in a continuous or
+- // non-continuous time interval for Aerosol
+- {46,35,1, {1,1,2,1,-1,-4,-1,-4,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,2,1,1,1,1,1,1,4,1,1,1,4,1,4} },
+- // 4.47: Individual ensemble forecast, control and
+- // perturbed, at horizontal level or in a horizontal
+- // in a continuous or non-continuous time interval for Aerosol
+- {47,38,1, {1,1,1,2,1,-1,-4,-1,-4,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,1,2,1,1,1,1,1,1,4,1,1,1,4,1,4} },
+-
+- // VALIDATION --- PDT 4.48
+- // 4.48: Analysis or forecast at a horizontal level or in a horizontal layer
+- // at a point in time for Optical Properties of Aerosol
+- {48,26,0, {1,1,2,1,-1,-4,-1,-4,1,-1,-4,-1,-4,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4} },
+-
+- // VALIDATION --- PDT 4.50
+- // 4.50: Analysis or forecast of multi component parameter or
+- // matrix element at a point in time
+- {50,21,0, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1,1,4,4,4,4} },
+-
+- // VALIDATIONi --- PDT 4.52
+- // 4.52: Analysis or forecast of Wave parameters
+- // at the Sea surface at a point in time
+- {52,15,0, {1,1,1,1,1,1,1,1,2,1,1,4,1,-1,-4} },
+-
+- // 4.51: Categorical forecasts at a horizontal level or
+- // in a horizontal layer at a point in time
+- {51,16,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1} },
+- // 4.91: Categorical forecasts at a horizontal level or
+- // in a horizontal layer at a point in time
+- // in a continuous or non-continuous time interval
+- {91,16,1, {1,1,1,1,1,2,1,1,4,1,-1,-4,1,-1,-4,1} }
-
- } ;
+-
+ extern const struct pdstemplate templatespds[];
-
++
+ g2int getpdsindex(g2int number);
#endif /* _pdstemplates_H */
diff --git a/g2clib.spec b/g2clib.spec
index 90625d3..ec3529f 100644
--- a/g2clib.spec
+++ b/g2clib.spec
@@ -1,6 +1,6 @@
Name: g2clib
-Version: 1.2.3
-Release: 4%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: GRIB2 encoder/decoder and search/indexing routines in C
Group: System Environment/Libraries
@@ -80,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 17 2012 Orion Poplawski <orion at cora.nwra.com> - 1.4.0-1
+- Update to 1.4.0
+- Rebase templates patch
+
* Fri Mar 9 2012 Orion Poplawski <orion at cora.nwra.com> - 1.2.3-4
- Add patch to avoid multiple definitions of templates
diff --git a/sources b/sources
index 7011b42..33362a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c328b424ab30cc362d9cbf79d94bba5 g2clib-1.2.3.tar
+72b236bad38131dc4997c68761fbe5ec g2clib-1.4.0.tar
More information about the scm-commits
mailing list