From bf718b358907d0790df409bec44a3f7d452dda21 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Aug 30 2018 08:46:39 +0000
Subject: [PATCH 1/3] Fix undefined references to HDF5 (bz#1623439)


---

diff --git a/cgnslib.spec b/cgnslib.spec
index c02ce37..7e577b9 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -1,6 +1,6 @@
 Name:           cgnslib
 Version:        3.3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Computational Fluid Dynamics General Notation System
 License:        zlib
 URL:            http://www.cgns.org/
@@ -24,7 +24,7 @@ BuildRequires:  mesa-libGLU-devel
 BuildRequires:  tcl-devel
 BuildRequires:  tk-devel
 BuildRequires:  zlib-devel
-Requires:       hdf5 = %{_hdf5_version}
+Requires:       hdf5%{?_isa} = %{_hdf5_version}
 
 %description
 The Computational Fluid Dynamics General Notation System (CGNS) provides a
@@ -38,6 +38,7 @@ an international steering committee.
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       hdf5-devel%{?_isa}
+Requires:       gcc-gfortran%{?_isa}
 
 %description    devel
 This package contains libraries and header files for
@@ -50,12 +51,16 @@ developing applications that use %{name} libraries.
 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
 
+# Remove executable bit
+chmod a-x src/cgnstools/utilities/cgns_to_vtk.c
+
 %build
 %cmake -DCMAKE_SKIP_RPATH=ON \
        -DCGNS_ENABLE_TESTS=ON \
        -DCGNS_ENABLE_FORTRAN=ON \
        -DCGNS_BUILD_CGNSTOOLS=ON \
-       -DCGNS_ENABLE_HDF5=ON
+       -DCGNS_ENABLE_HDF5=ON \
+       -DCMAKE_Fortran_FLAGS_RELEASE:STRING="$FCFLAGS -lhdf5 -DNDEBUG"
 # FIXME: Ugly workaround for build order issue which results in
 # an incomplete libcgns.so being created during the first run
 make || rm src/libcgns.so* && make
@@ -65,12 +70,14 @@ make || rm src/libcgns.so* && make
 %make_install
 find %{buildroot} -name '*.a' -delete -print
 
+# Add shebang
+# NEED CHECK - really need?
+sed -i -e '1i#!/bin/sh' %{buildroot}%{_bindir}/cgconfig
+
 %check
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %license license.txt
@@ -107,6 +114,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
 %{_fmoddir}/cgns.mod
 
 %changelog
+* Wed Aug 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 3.3.1-6
+- Fix undefined references to HDF5 (bz#1623439)
+- Add shebang to cgconfig
+- Remove spurious executable bit
+- Add Requires gcc-gfortran to the devel sub-package
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From af896702453ab21c3cc1a9e4eaedb267b6d2f553 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Aug 30 2018 09:22:42 +0000
Subject: [PATCH 2/3] Fix Fortran linker flags for epel7


---

diff --git a/cgnslib.spec b/cgnslib.spec
index 7e577b9..49ddd21 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -1,6 +1,6 @@
 Name:           cgnslib
 Version:        3.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Computational Fluid Dynamics General Notation System
 License:        zlib
 URL:            http://www.cgns.org/
@@ -60,7 +60,7 @@ chmod a-x src/cgnstools/utilities/cgns_to_vtk.c
        -DCGNS_ENABLE_FORTRAN=ON \
        -DCGNS_BUILD_CGNSTOOLS=ON \
        -DCGNS_ENABLE_HDF5=ON \
-       -DCMAKE_Fortran_FLAGS_RELEASE:STRING="$FCFLAGS -lhdf5 -DNDEBUG"
+       -DCMAKE_Fortran_FLAGS_RELEASE:STRING="$FCFLAGS -DNDEBUG $LDFLAGS -lhdf5 -fPIC"
 # FIXME: Ugly workaround for build order issue which results in
 # an incomplete libcgns.so being created during the first run
 make || rm src/libcgns.so* && make
@@ -114,6 +114,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
 %{_fmoddir}/cgns.mod
 
 %changelog
+* Thu Aug 30 2018 Antonio Trande <sagitterATfedoraproject.org> - 3.3.1-7
+- Fix Fortran linker flags for epel7
+
 * Wed Aug 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 3.3.1-6
 - Fix undefined references to HDF5 (bz#1623439)
 - Add shebang to cgconfig

From 56177a92474b2890836af188803d01afe90ed160 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Aug 30 2018 09:43:31 +0000
Subject: [PATCH 3/3] Fix shebang


---

diff --git a/cgnslib.spec b/cgnslib.spec
index 49ddd21..eaae525 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -72,7 +72,7 @@ find %{buildroot} -name '*.a' -delete -print
 
 # Add shebang
 # NEED CHECK - really need?
-sed -i -e '1i#!/bin/sh' %{buildroot}%{_bindir}/cgconfig
+sed -i -e '1i#!%{_bindir}/sh' %{buildroot}%{_bindir}/cgconfig
 
 %check
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test