From f212078039f59518f9784ac0250033f64956ae2f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Jun 29 2016 18:08:36 +0000
Subject: Update to 3.3.0


- Add patch to change Fortran module install location

---

diff --git a/.gitignore b/.gitignore
index 8a2e74b..68e1e42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ usersguide.pdf
 /cgnslib_3.1.3-4.tar.gz
 /cgnslib_3.2.tar.gz
 /cgnslib_3.2.1.tar.gz
+/cgnslib-3.3.0.tar.gz
diff --git a/cgnslib-fmod.patch b/cgnslib-fmod.patch
new file mode 100644
index 0000000..643123e
--- /dev/null
+++ b/cgnslib-fmod.patch
@@ -0,0 +1,12 @@
+diff -up CGNS-3.3.0/src/CMakeLists.txt.fmod CGNS-3.3.0/src/CMakeLists.txt
+--- CGNS-3.3.0/src/CMakeLists.txt.fmod	2016-01-25 16:22:32.000000000 -0700
++++ CGNS-3.3.0/src/CMakeLists.txt	2016-06-29 11:54:05.943502586 -0600
+@@ -540,7 +540,7 @@ install(FILES
+ if (CGNS_ENABLE_FORTRAN)
+   install(FILES
+           ${CMAKE_CURRENT_BINARY_DIR}/cgns.mod
+-          DESTINATION include)
++          DESTINATION ${LIB_INSTALL_DIR}/gfortran/modules)
+ endif (CGNS_ENABLE_FORTRAN)
+ 
+ if (CGNS_ENABLE_PARALLEL)
diff --git a/cgnslib.spec b/cgnslib.spec
index 5db7a18..ab0193e 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -1,10 +1,12 @@
 Name:           cgnslib
-Version:        3.2.1
-Release:        7%{?dist}
+Version:        3.3.0
+Release:        1%{?dist}
 Summary:        Computational Fluid Dynamics General Notation System
 License:        zlib
 URL:            http://www.cgns.org/
-Source0:        http://download.sourceforge.net/project/cgns/cgnslib_3.2/cgnslib_%{version}.tar.gz
+Source0:        https://github.com/CGNS/CGNS/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# Install Fortran module into proper location
+Patch0:         cgnslib-fmod.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-gfortran
 BuildRequires:  hdf5-devel
@@ -14,7 +16,7 @@ BuildRequires:  mesa-libGLU-devel
 BuildRequires:  tcl-devel
 BuildRequires:  tk-devel
 BuildRequires:  zlib-devel
-#Requires:       hdf5 = %{_hdf5_version}
+Requires:       hdf5 = %{_hdf5_version}
 
 %description
 The Computational Fluid Dynamics General Notation System (CGNS) provides a 
@@ -34,7 +36,8 @@ This package contains libraries and header files for
 developing applications that use %{name} libraries.
 
 %prep
-%setup -qn %{name}_%{version}
+%setup -qn CGNS-%{version}
+%patch0 -p1 -b .fmod
 # Multi-lib path fix.
 sed -i "s|\${CMAKE_INSTALL_PREFIX}/lib|\${CMAKE_INSTALL_PREFIX}/\${LIB_INSTALL_DIR}|" CMakeLists.txt
 sed -i "s|DESTINATION lib|DESTINATION \${LIB_INSTALL_DIR}|" src/CMakeLists.txt
@@ -45,7 +48,8 @@ sed -i "s|DESTINATION lib|DESTINATION \${LIB_INSTALL_DIR}|" src/CMakeLists.txt
        -DCGNS_ENABLE_FORTRAN=ON \
        -DCGNS_BUILD_CGNSTOOLS=ON \
        -DCGNS_ENABLE_HDF5=ON
-%make_build
+# Parallel make can fail building fortran module
+make
 
 %install
 %make_install
@@ -59,7 +63,8 @@ make test
 %postun -p /sbin/ldconfig
 
 %files
-%doc changelog license.txt readme.{lyx,txt}
+%license license.txt
+%doc changelog README.md
 %{_bindir}/adf2hdf
 %{_bindir}/cgconfig
 %{_bindir}/cgnscalc
@@ -77,20 +82,25 @@ make test
 %{_bindir}/hdf2adf
 %{_bindir}/unitconv
 %{_datadir}/cgnstools/
-%{_libdir}/libcgns.so.3.2
+%{_libdir}/libcgns.so.3.3
 
 %files devel
 %{_includedir}/cgnsBuild.defs
 %{_includedir}/cgns_io.h
 %{_includedir}/cgnslib.h
-%{_includedir}/cgnslib_f.h
 %{_includedir}/cgnstypes.h
 %{_includedir}/cgnstypes_f.h
+%{_includedir}/cgnstypes_f03.h
 %{_includedir}/cgnswin_f.h
 %{_includedir}/cgnsconfig.h
 %{_libdir}/libcgns.so
+%{_fmoddir}/cgns.mod
 
 %changelog
+* Wed Jun 29 2016 Orion Poplawski <orion@cora.nwra.com> - 3.3.0-1
+- Update to 3.3.0
+- Add patch to change Fortran module install location
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index ef4711c..a2dd79e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d26f88b2058dcd0ee5ce58f483bfccb  cgnslib_3.2.1.tar.gz
+64e5e8d97144c1462bee9ea6b2a81d7f  cgnslib-3.3.0.tar.gz