update to 5.0.0

closes #1 [release 5.0.0-1mamba;Mon Dec 30 2024]
This commit is contained in:
Silvan Calarco 2024-12-31 09:57:23 +01:00
parent 6ae39d63e1
commit db3f95f29d
2 changed files with 141 additions and 11 deletions

View File

@ -0,0 +1,126 @@
diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake
index 992103e..b60ef52 100644
--- a/config/cmake_files/medMacros.cmake
+++ b/config/cmake_files/medMacros.cmake
@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5)
##
## Requires 1.12.x version
##
- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)
+ IF (HDF5_VERSION VERSION_LESS 1.12.1)
MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.12.1 are supported.")
ENDIF()
##
diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c
index b0f7c59..2c1bb8e 100644
--- a/src/ci/MEDfileCompatibility.c
+++ b/src/ci/MEDfileCompatibility.c
@@ -116,7 +116,7 @@ MEDfileCompatibility(const char* const filename,
#if MED_NUM_MAJEUR != 5
#error "Don't forget to update the test version here when you change the major version of the library !"
#endif
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
#error "Cf. _MEDfileCreate ..."
#endif
diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c
index 8958f57..c27967b 100644
--- a/src/hdfi/_MEDfileCreate.c
+++ b/src/hdfi/_MEDfileCreate.c
@@ -189,7 +189,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
* Cette ligne est censée obliger HDF à ne pas utiliser un modèle interne différent de 1.10.z
* Un test autoconf permet de fixer un intervalle de version HDF à MED.
*/
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif
diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c
index 9ef55a0..5500776 100644
--- a/src/hdfi/_MEDfileOpen.c
+++ b/src/hdfi/_MEDfileOpen.c
@@ -113,7 +113,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
has been set in the group creation property list (see H5Pset_link_creation_order).
*/
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif
/* L'avantage de bloquer le modèle interne HDF5
diff --git a/src/hdfi/_MEDfileOpenForImport.c b/src/hdfi/_MEDfileOpenForImport.c
index 938c55d..497e1e3 100644
--- a/src/hdfi/_MEDfileOpenForImport.c
+++ b/src/hdfi/_MEDfileOpenForImport.c
@@ -53,7 +53,7 @@ med_idt _MEDfileOpenForImport(const char * const filename,const med_access_mode
}
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif
/* L'avantage de bloquer le modèle interne HDF5
diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c
index fbf059c..516e101 100644
--- a/src/hdfi/_MEDmemFileOpen.c
+++ b/src/hdfi/_MEDmemFileOpen.c
@@ -439,7 +439,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
goto ERROR;
}
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_V112, H5F_LIBVER_V112 ) ) {
@@ -506,7 +506,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
goto ERROR;
}
_fversionMM = 100*_fmajor+10*_fminor;
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif
if ( _fversionMM < 500 ) { /*100*MED_NUM_MAJEUR+10*MED_NUM_MINEUR*/
diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c
index 2d4e164..2a8ca7d 100644
--- a/src/hdfi/_MEDparFileCreate.c
+++ b/src/hdfi/_MEDparFileCreate.c
@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc
* En HDF5-1.10.0p1 cela n'a aucun effet !
* Un test autoconf permet de fixer un intervalle de version HDF à MED.
*/
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif
diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c
index d072f18..a226683 100644
--- a/src/hdfi/_MEDparFileOpen.c
+++ b/src/hdfi/_MEDparFileOpen.c
@@ -86,7 +86,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access
}
_fversionMM = 100*_fmajor+10*_fminor;
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif
if ( _fversionMM < 500 ) { /*100*MED_NUM_MAJEUR+10*MED_NUM_MINEUR*/
diff --git a/src/misc/MEDversionedApi3C.c b/src/misc/MEDversionedApi3C.c
index acc044f..e04078b 100644
--- a/src/misc/MEDversionedApi3C.c
+++ b/src/misc/MEDversionedApi3C.c
@@ -114,7 +114,7 @@ MedFuncType _MEDversionedApi3( const char * const key,
/* (_fversionMM <= (100*MED_NUM_MAJEUR+10*MED_NUM_MINEUR) ) */
/* ) { */
-#if H5_VERS_MINOR > 12
+#if H5_VERS_MINOR > 14
#error "Don't forget to change the compatibility version of the library !"
#endif

View File

@ -1,5 +1,5 @@
Name: med Name: med
Version: 4.0.0 Version: 5.0.0
Release: 1mamba Release: 1mamba
Summary: Modelization and data exchange library Summary: Modelization and data exchange library
Group: Applications/Scientific Group: Applications/Scientific
@ -7,12 +7,14 @@ Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.salome-platform.org/ URL: https://www.salome-platform.org/
Source: http://files.salome-platform.org/Salome/other/med-%{version}.tar.gz # NOTE: as of 5.0.0 requires manual download from browser
Source: https://files.salome-platform.org/Salome/medfile/med-%{version}.tar.bz2
Patch0: med-5.0.0-libhdf5-1.14.5.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: gcc-fortran
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libgfortran
BuildRequires: libhdf5-devel BuildRequires: libhdf5-devel
BuildRequires: libquadmath-devel BuildRequires: libquadmath-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
@ -20,7 +22,6 @@ BuildRequires: libstdc++6-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libhdf5-tools BuildRequires: libhdf5-tools
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
Modelization and data exchange library. Modelization and data exchange library.
@ -40,11 +41,10 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description -n lib%{name}-devel %description -n lib%{name}-devel
This package contains libraries and header files for developing applications that use %{name}. This package contains libraries and header files for developing applications that use %{name}.
%debug_package
%prep %prep
%setup -q %setup -q
%patch 0 -p1 -b .libhdf5-1.14.5
%ifarch x86_64 %ifarch x86_64
sed -i "s|DESTINATION lib)|DESTINATION lib64)|" src/CMakeLists.txt src/CMakeLists.txt.in \ sed -i "s|DESTINATION lib)|DESTINATION lib64)|" src/CMakeLists.txt src/CMakeLists.txt.in \
tools/medimport/CMakeLists.txt tools/medimport/CMakeLists.txt.in tools/medimport/CMakeLists.txt tools/medimport/CMakeLists.txt.in
@ -62,15 +62,15 @@ sed -i "s|DESTINATION lib)|DESTINATION lib64)|" src/CMakeLists.txt src/CMakeList
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/mdump2 %{_bindir}/mdump2
%{_bindir}/mdump3 %{_bindir}/mdump3
%{_bindir}/mdump4
%{_bindir}/medconforme %{_bindir}/medconforme
%{_bindir}/medimport %{_bindir}/medimport
%{_bindir}/xmdump4
%dir %{_bindir}/testc %dir %{_bindir}/testc
%{_bindir}/testc/test* %{_bindir}/testc/test*
%dir %{_bindir}/testf %dir %{_bindir}/testf
@ -96,12 +96,16 @@ sed -i "s|DESTINATION lib)|DESTINATION lib64)|" src/CMakeLists.txt src/CMakeList
%{_libdir}/libmedC.so %{_libdir}/libmedC.so
%{_libdir}/libmedfwrap.so %{_libdir}/libmedfwrap.so
%{_libdir}/libmedimport.so %{_libdir}/libmedimport.so
%dir %{_datadir}/cmake/med-fichier-%{version} %dir %{_datadir}/cmake/medfile-%{version}
%{_datadir}/cmake/med-fichier-%{version}/MEDFile*.cmake %{_datadir}/cmake/medfile-%{version}/MEDFile*.cmake
%dir %{_datadir}/doc/med-fichier-%{version} %dir %{_datadir}/doc/med-fichier-%{version}
%{_datadir}/doc/med-fichier-%{version}/* %{_datadir}/doc/med-fichier-%{version}/*
%doc ChangeLog README %doc ChangeLog README
%changelog %changelog
* Mon Dec 30 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 5.0.0-1mamba
- update to 5.0.0
- closes #1
* Tue Dec 03 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.0-1mamba * Tue Dec 03 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.0-1mamba
- package created using the webbuild interface - package created using the webbuild interface