diff --git a/0880eeab952cc122c635164a73c6749468e1b086.patch b/0880eeab952cc122c635164a73c6749468e1b086.patch deleted file mode 100644 index 0bb3fd2..0000000 --- a/0880eeab952cc122c635164a73c6749468e1b086.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rupN --no-dereference gmsh-4.5.2-source/Geo/CGNSZoneUnstruct.cpp gmsh-4.5.2-source-new/Geo/CGNSZoneUnstruct.cpp ---- gmsh-4.5.2-source/Geo/CGNSZoneUnstruct.cpp 2020-01-05 10:58:58.000000000 +0100 -+++ gmsh-4.5.2-source-new/Geo/CGNSZoneUnstruct.cpp 2020-02-17 15:33:58.359156182 +0100 -@@ -113,10 +113,10 @@ int CGNSZoneUnstruct::readSection( - if(cgnsErr != CG_OK) return cgnsError(__FILE__, __LINE__, fileIndex()); - - // check for compatibility with MIXED element sections --#if CGNS_VERSION < 3400 -+#if CGNS_VERSION < 4000 - if(sectEltType == MIXED) { - Msg::Error("Reading MIXED element sections requires CGNS library version" -- "3.4 or superior"); -+ "4 or superior"); - return 0; - } - #endif -@@ -130,7 +130,7 @@ int CGNSZoneUnstruct::readSection( - // read connectivity data - std::vector sectData(dataSize), offsetData(endElt - startElt + 2); - if(sectEltType == MIXED) { --#if CGNS_VERSION >= 3400 -+#if CGNS_VERSION >= 4000 - cgnsErr = cg_poly_elements_read(fileIndex(), baseIndex(), index(), iSect, - sectData.data(), offsetData.data(), 0); - #endif diff --git a/gmsh.spec b/gmsh.spec index ff87b02..6d4a923 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -4,7 +4,7 @@ Name: gmsh Summary: A three-dimensional finite element mesh generator Version: 4.5.2 -Release: 2%{?dist} +Release: 3%{?dist} # gmsh is GPLv2+ with exceptions, see LICENSE.txt # contrib/{DiscreteIntegration, HighOrderMeshOptimizer, MeshOptimizer, onelab} are MIT, see respective README.txt @@ -27,8 +27,6 @@ Patch3: gmsh_julia.patch Patch4: gmsh_install.patch # Fix build error caused by include ordering Patch5: gmsh_build.patch -# Backport fix to build against cngslib-3.4.1 -Patch6: 0880eeab952cc122c635164a73c6749468e1b086.patch BuildRequires: alglib-devel BuildRequires: ann-devel @@ -379,6 +377,9 @@ rm -f %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.txt %changelog +* Fri Feb 21 2020 Sandro Mani - 4.5.2-3 +- Rebuild (cgnslib) + * Mon Feb 17 2020 Sandro Mani - 4.5.2-2 - Rebuild (cgnslib)