[grads/f17: 9/9] Merge branch 'master' into f17

[Deji Akingunola]

commit 0ae75f3d966d43b44828d92a26a6677830581917
Merge: 33ed518 f5c0cb8
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Tue Jun 11 12:19:53 2013 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	grads.spec
    
    Update to version 2.0.2

 .gitignore |    1 +
 grads.spec |   13 +++++--------
 sources    |    2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --cc grads.spec
index 47c7ed8,6916e57..e5bdbe8
--- a/grads.spec
+++ b/grads.spec
@@@ -90,6 -84,27 +84,9 @@@ make install DESTDIR=$RPM_BUILD_ROO
  
  
  %changelog
+ * Tue Jun 11 2013 Deji Akingunola <dakingun at gmail.com> - 2.0.2-1
+ - Update to 2.0.2
+ 
 -* Tue Jun 11 2013 Remi Collet <rcollet at redhat.com> - 2.0.1-8
 -- rebuild for new GD 2.1.0
 -
 -* Thu May 16 2013 Orion Poplawski <orion at cora.nwra.com> - 2.0.1-7
 -- Rebuild for hdf5 1.8.11
 -
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-6
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.0.1-5
 -- rebuild due to "jpeg8-ABI" feature drop
 -
 -* Mon Dec 03 2012 Orion Poplawski <orion at cora.nwra.com> - 2.0.1-4
 -- Rebuild for hdf5 1.8.10
 -
 -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
  * Wed Feb 22 2012 Deji Akingunola <dakingun at gmail.com> - 2.0.1-2
  - Disable gui build option (again), it depends on the orphaned libsx