[cgnslib/f19: 8/8] Merge branch 'master' into f19

[Christopher Meng]

commit 9463f621a785a4003797de5407de48a83c4729c8
Merge: 3a7aece 0947211
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 2 12:10:37 2014 +0800

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	cgnslib.spec
    	sources

 .gitignore   |    5 +--
 cgnslib.spec |   98 +++++++++++++++++++++++++++++----------------------------
 sources      |    4 ++
 3 files changed, 55 insertions(+), 52 deletions(-)
---
diff --cc .gitignore
index 1794100,8a2e74b..eeb059a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,6 +1,2 @@@
--cgnslib_2.5-4.tar.gz
++/cgnslib_*.tar.gz
  usersguide.pdf
--/cgnslib_2.5-5.tar.gz
--/cgnslib_3.1.3-4.tar.gz
--/cgnslib_3.2.tar.gz
 -/cgnslib_3.2.1.tar.gz
diff --cc cgnslib.spec
index b801080,587605a..29680b2
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@@ -90,6 -86,27 +86,12 @@@ make tes
  %{_libdir}/libcgns.so
  
  %changelog
+ * Mon Jun 30 2014 Christopher Meng <rpm at cicku.me> - 3.2.1-1
+ - Update to 3.2.1
+ - Enable hdf5 support
+ - Enable fortran support
+ - Build cgnstools(included in main package)
+ 
 -* Tue Jun 10 2014 Orion Poplawski <orion at cora.nwra.com> - 3.2-6
 -- Rebuild for hdf 1.8.13
 -
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Fri Dec 27 2013 Orion Poplawski <orion at cora.nwra.com> - 3.2-4
 -- Rebuild for hdf5 1.8.12
 -
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Thu May 16 2013 Orion Poplawski <orion at cora.nwra.com> - 3.2-2
 -- Rebuild for hdf5 1.8.11
 -
  * Mon Mar 18 2013 Shakthi Kannan <shakthimaan [AT] fedoraproject dot org> - 3.2-1
  - new upstream version 3.2
  - userguide not provided any more
diff --cc sources
index 7a9f6e5,ef4711c..9569752
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +3006b73265415ac0bf8999b71ffd0e58  cgnslib_3.2.tar.gz
++=======
+ 2d26f88b2058dcd0ee5ce58f483bfccb  cgnslib_3.2.1.tar.gz
++>>>>>>> master