[netcdf: 2/2] Merge with 4.1.2-2 changes

[Orion Poplawski]

commit 7381f5f43026f4ef4efeee589ebe48353fa7c80e
Merge: 38fd9ad 4589ce8
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jun 21 10:23:59 2011 -0600

    Merge with 4.1.2-2 changes

 netcdf.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc netcdf.spec
index d464bc3,ffe1e04..7cce5e3
--- a/netcdf.spec
+++ b/netcdf.spec
@@@ -157,11 -160,9 +157,14 @@@ f
  
  
  %changelog
 +* Tue Jun 21 2011 Orion Poplawski <orion at cora.nwra.com> - 4.1.3-1
 +- Update to 4.1.3
 +- Update pkgconfig and fflags patches
 +- Drop libm patch fixed upstream
 +
+ * Tue May 17 2011 Orion Poplawski <orion at cora.nwra.com> - 4.1.2-2
+ - Rebuild for hdf5 1.8.7
+ 
  * Thu Mar 31 2011 Orion Poplawski <orion at cora.nwra.com> - 4.1.2-1
  - Update to 4.1.2 (soname bump)
  - Add patch to add -lm to libnetcdf4