[whatsup/f17: 12/12] Merge branch 'master' into f17

[David Brown]

commit 1e235618f43782d8ef991ae50d3ffb6b49a5a260
Merge: a2a8e9a 8f5870c
Author: David Brown <david.brown at pnl.gov>
Date:   Tue Jul 24 21:28:08 2012 -0700

    Merge branch 'master' into f17

 whatsup.spec |   58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 11 deletions(-)
---
diff --cc whatsup.spec
index a7756aa,f7d827e..b7dacf5
--- a/whatsup.spec
+++ b/whatsup.spec
@@@ -254,10 -289,8 +289,11 @@@ f
  %changelog
  * Tue Jul 24 2012 David Brown <david.brown at pnnl.gov> - 1.13-1
  - New Upstream Release
+ - Made one spec file to rule them all ... at least el5 el6 f17 f16
  
 +* Tue Mar 13 2012 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.12-8
 +- Rebuild for new opensm
 +
  * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-10
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild