Compare commits

...

42 Commits
el6 ... rawhide

Author SHA1 Message Date
Fedora Release Engineering 0122530da2 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 20:51:06 +00:00
Python Maint d86f66da36 Rebuilt for Python 3.11 2022-06-13 15:10:06 +02:00
Sandro Mani 3bf9c68b4e Fix FTBFS with cmake 3.23.0 2022-03-05 22:23:21 +01:00
Fedora Release Engineering 6f44c0f54a - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 19:00:47 +00:00
Sandro Mani 418352995f Port to hdf5-1.12 2021-12-03 09:52:01 +01:00
Orion Poplawski afe6705faa Rebuild for hdf5 1.10.7 2021-08-09 20:09:23 -06:00
Fedora Release Engineering b238615fb6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 14:03:59 +00:00
Python Maint e238d41cc6 Rebuilt for Python 3.10 2021-06-04 20:11:23 +02:00
Fedora Release Engineering abad9fcf15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 19:34:33 +00:00
Sandro Mani 39062b934e Update to 4.1.0 2020-07-30 16:25:00 +02:00
Fedora Release Engineering 15400a33c3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 07:11:49 +00:00
Sandro Mani d361b3f64f Use %cmake_build, %cmake_install 2020-07-21 18:03:09 +02:00
Orion Poplawski 8fbe399779 Rebuild for hdf5 1.10.6 2020-06-25 14:24:01 -06:00
Miro Hrončok 957cd83d62 Rebuilt for Python 3.9 2020-05-26 02:52:49 +02:00
Fedora Release Engineering 0702d2ef08 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 12:29:32 +00:00
Miro Hrončok d820681dde Rebuilt for Python 3.8.0rc1 (#1748018) 2019-10-03 13:56:42 +02:00
Miro Hrončok 77aea077f5 Rebuilt for Python 3.8 2019-08-19 10:19:44 +02:00
Fedora Release Engineering dd3dc2ed06 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 16:17:55 +00:00
Charalampos Stratakis 1271e48da5 Don't hard-code python's abi flags 2019-06-03 17:30:10 +02:00
Sandro Mani 12b90d88e1 Update to 4.0.0 2019-03-13 11:31:59 +01:00
Fedora Release Engineering 0ee9deeb57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 10:06:14 +00:00
Igor Gnatenko 1699ff068c
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:40:23 +01:00
Miro Hrončok 7fb149f1bb Remove python2 subpackage (#1627343) 2018-10-03 16:21:32 +02:00
Fedora Release Engineering e693b02bd7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 10:05:25 +00:00
Igor Gnatenko 8ac04657fd add BuildRequires: gcc-c++
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:49 +02:00
Miro Hrončok a999624179 Rebuilt for Python 3.7 2018-06-19 10:47:32 +02:00
Sandro Mani ba21583625 Update to 3.3.1 2018-03-10 00:03:17 +01:00
Fedora Release Engineering 4b7304fbdb - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 01:33:35 +00:00
Jitka Plesnikova 105a740bb5 Rebuild for new gfortran 2018-02-05 10:58:27 +01:00
Fedora Release Engineering 1196d718db - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 03:12:26 +00:00
Fedora Release Engineering f070f4f1b9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 21:13:54 +00:00
Sandro Mani 72d9504895 Update to 3.2.1 2017-05-06 19:21:21 +02:00
Fedora Release Engineering aee2e4f5ed - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 20:48:09 +00:00
Sandro Mani 6ed0556671 Rebuild (gfortran) 2017-02-01 12:55:13 +01:00
Sandro Mani a23b597d18 Update to 3.2.0 2016-10-03 11:07:15 +02:00
Fedora Release Engineering 2f354ffe3c - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 07:55:33 +00:00
Sandro Mani 3c5106141d Update to 3.1.0 2016-02-06 12:46:03 +01:00
Dennis Gilmore fc5b248f3e - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 05:13:28 +00:00
Orion Poplawski d23ff698d8 Rebuild for hdf5 1.8.16 2016-01-21 12:11:51 -07:00
Dennis Gilmore 9d1737f325 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 19:55:56 +00:00
Orion Poplawski aa598bcf35 Rebuild for hdf5 1.8.15 2015-05-17 15:03:05 -06:00
Kalev Lember 062fbf43c5 Rebuilt for GCC 5 C++11 ABI change 2015-05-02 15:56:54 +02:00
8 changed files with 672 additions and 2647 deletions

6
.gitignore vendored
View File

@ -1,2 +1,8 @@
/med-3.0.7.tar.gz /med-3.0.7.tar.gz
/med-3.0.8.tar.gz /med-3.0.8.tar.gz
/med-3.1.0.tar.gz
/med-3.2.0.tar.gz
/med-3.2.1.tar.gz
/med-3.3.1.tar.gz
/med-4.0.0.tar.gz
/med-4.1.0.tar.gz

View File

@ -1,12 +0,0 @@
diff -rupN med-3.0.7_SRC/config/med_check_swig.m4 med-3.0.7_SRC-new/config/med_check_swig.m4
--- med-3.0.7_SRC/config/med_check_swig.m4 2013-10-22 14:38:08.000000000 +0200
+++ med-3.0.7_SRC-new/config/med_check_swig.m4 2015-01-03 19:24:13.966353105 +0100
@@ -53,7 +53,7 @@ AC_DEFUN([MED_CHECK_SWIG],
test -n "${SWIG}" && WITH_SWIG=1
eval "${SWIG} -help >/dev/null 2>&1" && WITH_SWIG=1
# fi
- ],[
+ ],[:
])
AC_SUBST(SWIG)

View File

@ -1,12 +0,0 @@
diff -rupN med-3.0.7_SRC/configure.ac med-3.0.7_SRC-new/configure.ac
--- med-3.0.7_SRC/configure.ac 2013-11-28 12:27:09.000000000 +0100
+++ med-3.0.7_SRC-new/configure.ac 2014-05-23 00:09:08.803332678 +0200
@@ -36,7 +36,7 @@ AC_CONFIG_MACRO_DIR([config])
## Initialize Automake
-AM_INIT_AUTOMAKE([dist-bzip2 tar-ustar serial-tests])
+AM_INIT_AUTOMAKE([dist-bzip2 tar-ustar])
##
AC_CONFIG_HEADER(include/med_config.h)

File diff suppressed because it is too large Load Diff

446
med-hdf5-1.12.patch Normal file
View File

@ -0,0 +1,446 @@
diff -rupN med-4.1.0/config/cmake_files/medMacros.cmake med-4.1.0-new/config/cmake_files/medMacros.cmake
--- med-4.1.0/config/cmake_files/medMacros.cmake 2021-12-03 09:35:30.675827163 +0100
+++ med-4.1.0-new/config/cmake_files/medMacros.cmake 2021-12-03 09:32:31.894994147 +0100
@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5)
##
## Requires 1.10.x version
##
- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
+ IF (HDF5_VERSION VERSION_LESS 1.10.2)
MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
ENDIF()
##
diff -rupN med-4.1.0/src/ci/MEDfileCompatibility.c med-4.1.0-new/src/ci/MEDfileCompatibility.c
--- med-4.1.0/src/ci/MEDfileCompatibility.c 2021-12-03 09:35:30.676827162 +0100
+++ med-4.1.0-new/src/ci/MEDfileCompatibility.c 2021-12-03 09:33:26.292942149 +0100
@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const f
_hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
/* ISCRUTE(_hversionMMR); */
/* ISCRUTE(HDF_VERSION_NUM_REF); */
- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
+ if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
/* TODO : Vérifier si la version mineure HDF du fichier est supérieure
à la version mineure de la bibliothèque HDF utilisée :
@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const f
#if MED_NUM_MAJEUR != 4
#error "Don't forget to update the test version here when you change the major version of the library !"
#endif
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
#error "Cf. _MEDfileCreate ..."
#endif
diff -rupN med-4.1.0/src/hdfi/_MEDattributeNumWrByName.c med-4.1.0-new/src/hdfi/_MEDattributeNumWrByName.c
--- med-4.1.0/src/hdfi/_MEDattributeNumWrByName.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0-new/src/hdfi/_MEDattributeNumWrByName.c 2021-12-03 09:33:08.851958696 +0100
@@ -68,7 +68,7 @@ med_err _MEDattributeNumWrByName(med_idt
if ( (_attid=H5Aopen_by_name( pid, path, attname, H5P_DEFAULT, H5P_DEFAULT )) >= 0 ) {
- if ( H5Oget_info( pid, &_oinfo ) <0) {
+ if ( H5Oget_info( pid, &_oinfo, H5O_INFO_ALL ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
goto ERROR;
}
diff -rupN med-4.1.0/src/hdfi/_MEDattributeNumWr.c med-4.1.0-new/src/hdfi/_MEDattributeNumWr.c
--- med-4.1.0/src/hdfi/_MEDattributeNumWr.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0-new/src/hdfi/_MEDattributeNumWr.c 2021-12-03 09:33:11.840955852 +0100
@@ -77,7 +77,7 @@ med_err _MEDattributeNumWr(med_idt pid,
if ( (_attid=H5Aopen( pid, attname, H5P_DEFAULT )) >= 0 ) {
- if ( H5Oget_info( pid, &_oinfo ) <0) {
+ if ( H5Oget_info( pid, &_oinfo, H5O_INFO_ALL ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
goto ERROR;
}
diff -rupN med-4.1.0/src/hdfi/_MEDcheckAttributeStringFunc.c med-4.1.0-new/src/hdfi/_MEDcheckAttributeStringFunc.c
--- med-4.1.0/src/hdfi/_MEDcheckAttributeStringFunc.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0-new/src/hdfi/_MEDcheckAttributeStringFunc.c 2021-12-03 09:33:14.266953546 +0100
@@ -40,7 +40,7 @@ med_err _MEDcheckAttributeStringFunc(med
oinfo.type=H5G_LINK;
break;
case H5L_TYPE_HARD:
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_ALL, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
diff -rupN med-4.1.0/src/hdfi/_MEDchecknSublinkFunc.c med-4.1.0-new/src/hdfi/_MEDchecknSublinkFunc.c
--- med-4.1.0/src/hdfi/_MEDchecknSublinkFunc.c 2020-03-11 10:36:36.000000000 +0100
+++ med-4.1.0-new/src/hdfi/_MEDchecknSublinkFunc.c 2021-12-03 09:33:16.487951437 +0100
@@ -41,7 +41,7 @@ med_err _MEDchecknSublinkFunc(med_idt id
oinfo.type=H5G_LINK;
break;
case H5L_TYPE_HARD:
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_ALL, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
diff -rupN med-4.1.0/src/hdfi/_MEDdatagroupExist.c med-4.1.0-new/src/hdfi/_MEDdatagroupExist.c
--- med-4.1.0/src/hdfi/_MEDdatagroupExist.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0-new/src/hdfi/_MEDdatagroupExist.c 2021-12-03 09:33:18.742949298 +0100
@@ -45,7 +45,7 @@ med_err _MEDdatagroupExist(const med_idt
case H5L_TYPE_HARD:
*isasoftlink = MED_FALSE;
- if ( H5Oget_info_by_name( gid, datagroupname, &_oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( gid, datagroupname, &_oinfo, H5O_INFO_ALL, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE( datagroupname);
}
diff -rupN med-4.1.0/src/hdfi/_MEDdatasetExist.c med-4.1.0-new/src/hdfi/_MEDdatasetExist.c
--- med-4.1.0/src/hdfi/_MEDdatasetExist.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0-new/src/hdfi/_MEDdatasetExist.c 2021-12-03 09:33:24.158944167 +0100
@@ -47,7 +47,7 @@ med_err _MEDdatasetExist(const med_idt
case H5L_TYPE_HARD:
*isasoftlink = MED_FALSE;
- if ( H5Oget_info_by_name( gid, datasetname, &_oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( gid, datasetname, &_oinfo, H5O_INFO_ALL, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE( datasetname);
}
diff -rupN med-4.1.0/src/hdfi/_MEDfileCreate.c med-4.1.0-new/src/hdfi/_MEDfileCreate.c
--- med-4.1.0/src/hdfi/_MEDfileCreate.c 2021-12-03 09:35:30.677827161 +0100
+++ med-4.1.0-new/src/hdfi/_MEDfileCreate.c 2021-12-03 09:32:31.894994147 +0100
@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * cons
* 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 > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
diff -rupN med-4.1.0/src/hdfi/_MEDfileOpen.c med-4.1.0-new/src/hdfi/_MEDfileOpen.c
--- med-4.1.0/src/hdfi/_MEDfileOpen.c 2021-12-03 09:35:30.677827161 +0100
+++ med-4.1.0-new/src/hdfi/_MEDfileOpen.c 2021-12-03 09:32:31.894994147 +0100
@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const
• The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
*/
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
/* L'avantage de bloquer le modèle interne HDF5
diff -rupN med-4.1.0/src/hdfi/_MEDlinkObjs.c med-4.1.0-new/src/hdfi/_MEDlinkObjs.c
--- med-4.1.0/src/hdfi/_MEDlinkObjs.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0-new/src/hdfi/_MEDlinkObjs.c 2021-12-03 09:33:21.096947067 +0100
@@ -62,7 +62,7 @@ med_err _MEDlinkobjs(med_idt id,const ch
sur un lien hard
Sur un lien soft H5O_TYPE_UNKNOWN
*/
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_ALL, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
diff -rupN med-4.1.0/src/hdfi/_MEDmemFileOpen.c med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c
--- med-4.1.0/src/hdfi/_MEDmemFileOpen.c 2021-12-03 09:35:30.678827160 +0100
+++ med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c 2021-12-03 09:32:31.894994147 +0100
@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * con
goto ERROR;
}
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
diff -rupN med-4.1.0/src/hdfi/_MEDparFileCreate.c med-4.1.0-new/src/hdfi/_MEDparFileCreate.c
--- med-4.1.0/src/hdfi/_MEDparFileCreate.c 2021-12-03 09:35:30.678827160 +0100
+++ med-4.1.0-new/src/hdfi/_MEDparFileCreate.c 2021-12-03 09:32:31.894994147 +0100
@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * c
* 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 > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
diff -rupN med-4.1.0/src/hdfi/_MEDparFileOpen.c med-4.1.0-new/src/hdfi/_MEDparFileOpen.c
--- med-4.1.0/src/hdfi/_MEDparFileOpen.c 2021-12-03 09:35:30.679827159 +0100
+++ med-4.1.0-new/src/hdfi/_MEDparFileOpen.c 2021-12-03 09:32:31.894994147 +0100
@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * con
MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
goto ERROR;
}
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
diff -rupN med-4.1.0/tools/medimport/2.3.6/_MEDconvertStringDatasets.c med-4.1.0-new/tools/medimport/2.3.6/_MEDconvertStringDatasets.c
--- med-4.1.0/tools/medimport/2.3.6/_MEDconvertStringDatasets.c 2020-03-11 10:36:40.000000000 +0100
+++ med-4.1.0-new/tools/medimport/2.3.6/_MEDconvertStringDatasets.c 2021-12-03 09:34:42.715870908 +0100
@@ -52,7 +52,7 @@ med_err _MEDconvertStringDatasets(med_id
oinfo.type=(H5O_type_t) H5G_LINK;
break;
case H5L_TYPE_HARD:
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_ALL, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
diff -rupN med-4.1.0/tools/medimport/4.0.0/_MEDfieldValueUpdateEntityList41.c med-4.1.0-new/tools/medimport/4.0.0/_MEDfieldValueUpdateEntityList41.c
--- med-4.1.0/tools/medimport/4.0.0/_MEDfieldValueUpdateEntityList41.c 1970-01-01 01:00:00.000000000 +0100
+++ med-4.1.0-new/tools/medimport/4.0.0/_MEDfieldValueUpdateEntityList41.c 2020-03-11 10:52:20.000000000 +0100
@@ -0,0 +1,253 @@
+/* This file is part of MED.
+ *
+ * COPYRIGHT (C) 1999 - 2020 EDF R&D, CEA/DEN
+ * MED is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MED is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with MED. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <med.h>
+#include <med_config.h>
+#include <med_outils.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* Inclus par med.h.in */
+/* #include <stdint.h> */
+
+/* #define NDEBUG */
+/* #include <assert.h> */
+
+/* const char * const _MEDgetEntityListAttributeIName(const med_entity_type entitytype) { */
+/* switch( entitytype ) { */
+/* case MED_UNDEF_ENTITY_TYPE : return MED_NOM_LEN; break; */
+/* case MED_CELL : return MED_NOM_LGC; break; */
+/* case MED_NODE : return MED_NOM_LGN; break; */
+/* case MED_DESCENDING_FACE : return MED_NOM_LGF; break; */
+/* case MED_DESCENDING_EDGE : return MED_NOM_LGE; break; */
+/* case MED_NODE_ELEMENT : return MED_NOM_LGT; break; */
+/* case MED_STRUCT_ELEMENT : return MED_NOM_LGS; break; */
+/* } */
+/* } */
+/* /\*ALL : Toutes les étapes de calcul.*\/ */
+/* const char * const _MEDgetEntityListAttributeINameAll(const med_entity_type entitytype) { */
+/* switch( entitytype ) { */
+/* case MED_UNDEF_ENTITY_TYPE : return MED_NOM_LAA; break; */
+/* case MED_CELL : return MED_NOM_LCA; break; */
+/* case MED_NODE : return MED_NOM_LNA; break; */
+/* case MED_DESCENDING_FACE : return MED_NOM_LFA; break; */
+/* case MED_DESCENDING_EDGE : return MED_NOM_LEA; break; */
+/* case MED_NODE_ELEMENT : return MED_NOM_LTA; break; */
+/* case MED_STRUCT_ELEMENT : return MED_NOM_LSA; break; */
+/* } */
+/* } */
+
+
+/*Mise à jour de la liste des types d'entités/géométriques utilisés globlalement au niveau du datagroup _gid0 et
+ Mise à jour de la liste des types d'entités/géométriques utilisés localement au niveau du datagroup _gid1
+ Les gidname sont utilisés pour générér des messages d'erreur avec des informations significatives (todo : retrouver le nom avec l'objid)
+*/
+
+med_int _MEDfieldValueUpdateEntityList(const char * const gid0name ,
+ const char * const gid1name ,
+ const med_idt gid0 ,
+ const med_idt gid1 ,
+ const med_entity_type entitytype ,
+ const med_geometry_type geotype ,
+ const med_bool forentity ) {
+
+ med_bool _attexist = MED_FALSE;
+ med_err _ret = -1;
+ uint32_t _lentitytype1 = 0;
+ uint32_t _lentitytype2 = 0;
+ uint32_t _lentitytype1sav = 0;
+ uint32_t _lentitytype2sav = 0;
+ uint32_t _lgeotype = 0;
+ med_int _nsamelentitype = 0;
+ med_int _nsamelentitypesav = 0;
+ med_idt _gid = gid0;
+ med_idt _datagroup1 = gid1;
+ const char * _attname = NULL;
+ const char * _attallname = NULL;
+ const char * fieldname = gid0name;
+ const char * _datagroupname1 = gid1name;
+ med_entity_type _entytypeforattname = MED_UNDEF_ENTITY_TYPE;
+ int _it = 0;
+
+
+ /*Si l'on met à jour la liste des types géométriques (forentity==0), il faut récupérer :
+ - le nom de l'attribut qui les stocke pour l'entitytype passé en paramètre
+ - le nom de l'attribut qui stocke le nombre d'étapes de calcul qui ont la même liste
+ Sinon, on récupère, les noms d'attributs associés à la liste des type d'entités
+ */
+ if (! forentity) _entytypeforattname = entitytype;
+ _attname = _MEDgetEntityListAttributeIName (_entytypeforattname);
+ _attallname = _MEDgetEntityListAttributeINameAll (_entytypeforattname);
+
+ /* - La fonction MEDgetEntityGeometyTypeIt(entitytype,geotype) nous permet d'obtenir un numéro d'itération de type géométrique
+ (commence à 1 et est incrémental) que l'on associe à un numéro de bit d'un entier 32bits (1 entier pour chaque type d'entité)
+ - Cet entier est stocké pour chaque étape de calcul et globalement au champ (si au moins un type géométrique existe pour ce type d'entité).
+ Cela permet de limiter la taille du stockage et d'accéder directement par type d'entité aux types géométriques présents.
+ */
+ if (forentity)
+ _it=entitytype;
+ else
+ _it=MEDgetEntityGeometryTypeIt(entitytype, geotype)-1;
+
+ /* ISCRUTE_int(entitytype);ISCRUTE_int(geotype); */
+ /* SSCRUTE(MED_GET_ENTITY_TYPENAME[MEDgetEntityTypeIt(entitytype)]); */
+ /*TODO : Etudier la possibilité de récupérer le nom avec l'id de l'objet */
+
+ /* SSCRUTE(fieldname); */
+ /* SSCRUTE(MEDgetEntityTypeName(entitytype)); SSCRUTE(MEDgetGeometryTypeName(geotype)); */
+ /* SSCRUTE(_attname); SSCRUTE(_attallname); */
+
+ /*Lire l'attribut _attname s'il exite, sinon la valeur lue est nulle */
+ _MEDattributeExist(_gid,".",_attname,&_attexist);
+ if (_attexist) {
+/* if ( forentity) */
+ if (_MEDattributeInt32Rd(_gid,_attname,&_lentitytype1sav) < 0) {
+ MED_ERR_(_ret,MED_ERR_READ,MED_ERR_ATTRIBUTE,MED_ERR_FIELD_MSG);
+ SSCRUTE(fieldname);SSCRUTE(_attname);goto ERROR;
+ }
+ }
+ _lentitytype1 = _lentitytype1sav;
+
+ /* _MEDset32bits(&_lentitytype1, MEDgetEntityTypeIt(entitytype)); */
+ /* On utilise directement la valeur de l'enum pour l'entitype, ainsi on utilise le décalage de 0 (on économise 1bit) */
+ /* Mise à jour de la liste d'entités/types géométriques au niveau du champ */
+ /* */
+ /* ISCRUTE_int8(_lentitytype1sav); */
+ /* _MEDset32bits(&_lentitytype1, MEDgetEntityTypeIt(entitytype)); */
+ /* Utilise le numéro d'itération pour le type géométrique du type d'entité donné pour positionner le bit de même position (-1) */
+ _MEDset32bits(&_lentitytype1, _it);
+ /* ISCRUTE_int8(_lentitytype1); */
+
+ /* Ecriture de la liste globale des types */
+ /*REM : Si l'attribut n'existait pas _lentitytype1sav == 0 et il ne se peut pas que _lentitytype1 == 0 même si entitytype == 0
+ à cause du _MEDsetNbits() */
+ if ( _lentitytype1sav != _lentitytype1 ) {
+/* if ( forentity) */
+ if ( _MEDattributeInt32Wr(_gid,_attname,&_lentitytype1) < 0) {
+ MED_ERR_(_ret,MED_ERR_WRITE,MED_ERR_ATTRIBUTE,MED_ERR_FIELD_MSG);
+ SSCRUTE(fieldname);SSCRUTE(_attname);goto ERROR;
+ }
+ }
+
+ /*
+ * Il faut mettre à jour au niveau 2 (étape de calcul)
+ * la liste des types d'entités ou des types géométriques d'entités utilisées
+ */
+ _MEDattributeExist(_datagroup1,".",_attname,&_attexist);
+ if (_attexist) {
+ if (_MEDattributeInt32Rd(_datagroup1,_attname,&_lentitytype2sav) < 0) {
+ MED_ERR_(_ret,MED_ERR_READ,MED_ERR_ATTRIBUTE,MED_ERR_FIELD_MSG);
+ SSCRUTE(fieldname);SSCRUTE(_datagroupname1);SSCRUTE(_attname);goto ERROR;
+ }
+ }
+ _lentitytype2 = _lentitytype2sav;
+
+ /* Mise à jour de la liste d'entités*/
+ /* ISCRUTE_int8(_lentitytype2sav); */
+ _MEDset32bits(&_lentitytype2, _it);
+ /* ISCRUTE_int8(_lentitytype2); */
+
+ if ( _lentitytype2sav != _lentitytype2 )
+ if ( _MEDattributeInt32Wr(_datagroup1,_attname,&_lentitytype2) < 0) {
+ MED_ERR_(_ret,MED_ERR_WRITE,MED_ERR_ATTRIBUTE,MED_ERR_FIELD_MSG);
+ SSCRUTE(fieldname);SSCRUTE(_datagroupname1);SSCRUTE(_attname);goto ERROR;
+ }
+
+ /* GESTION DU NOMBRE D'ETAPES DE CALCUL */
+
+ /* Il faut pouvoir indiquer à l'utilisateur qu'il n'a pas besoin d'interroger toutes les étapes de calcul
+ pour connaître la liste des types d'entités utilisées si cette liste est la même pour toutes les étapes.
+ On vérifie que la liste des types d'entités utilisées à cette étape de calcul est le même que celle au niveau du champ global :
+
+ - Si la liste des types d'entités ou des types géométriques d'entité utilisés globalement
+ avant l'appel à cette fonction était identique à la notre avant m.a.j. :
+ _lentitytype1sav == _lentitytype2sav =>
+ * Si la nouvelle liste est toujours identique :
+ Ne rien faire, on le change pas le nbre d'étapes de calcul ayant la même liste
+ * Si la nouvelle liste devient différente (ajout d'un nouveau type à la liste) :
+ positionner le nombre d'étapes de calcul ayant la même liste de types d'entités à 1 (la notre)
+ - Si la liste des types d'entités utilisés avant l'appel à cette fonction était différente
+ entre celle de tous les autres étapes de calcul et celle de notre étape de calcul :
+ _lentitytype1sav != _lentitytype2sav =>
+ * Si la nouvelle liste est identique incrémenter le nombre d'étapes de calcul ayant la même liste de types d'entités
+ * Si la nouvelle liste est toujours différente :
+ Si notre type d'entité n'appartenait pas à la liste globale initiale => 0 sinon Ne rien faire,
+ on le change pas le nbre d'étapes de calcul ayant la même liste.
+ */
+
+ /* Cree l'attribut _attallname s'il n'exite pas déjà au niveau 0, sinon lit sa valeur */
+ /* Nombre d'étapes de calcul partageant la même liste d'entités/types géométriques */
+ _MEDattributeExist(_gid,".",_attallname,&_attexist);
+ if (_attexist) {
+ if (_MEDattrEntierLire(_gid,_attallname,&_nsamelentitype) < 0) {
+ MED_ERR_(_ret,MED_ERR_READ,MED_ERR_ATTRIBUTE,MED_ERR_FIELD_MSG);
+ SSCRUTE(fieldname);SSCRUTE(_attallname);goto ERROR;
+ }
+ } else
+ _nsamelentitype = 0;
+ _nsamelentitypesav = _nsamelentitype;
+
+ /** Il faut vérifier pour notre type d'entité indépendemment des autres déjà positionnées **/
+ /*(VERIF:) En HDF//, le mécanisme fonctionne car l'écriture d'attribut n'est pas // */
+ /* Si les listes de types d'entitées étaient identiques */
+ if ( _lentitytype1sav == _lentitytype2sav ) {
+ if ( (_lentitytype1sav != _lentitytype1 /*faux : idem _lentitytype2*/ ) || (!_lentitytype1sav) ) {
+ /*Le fait que l'on en ajoute ou en supprime un modifie le nbre d'étape de calcul ayant la meme liste */
+ /*Si on ajoute un nouveau type d'entite, il n'y a plus que notre étape en adéquation. */
+ _nsamelentitype=1;
+ /*La supression d'un type d'entité écrit en MED n'est pas possible*/
+ /* ISCRUTE(_nsamelentitype); */
+ } else {
+ /*Il n'y a rien à faire car notre liste de type est toujours la même que la globale*/
+ /* ISCRUTE(_nsamelentitype); */
+ }
+ } else {
+ /* Si les listes de types d'entitées étaient déjà différentes */
+ /*Si nos listes sont devenues les mêmes*/
+ if (_lentitytype1 == _lentitytype2) {
+ /*Les liste de types d'entités deviennent identiques, il faut alors incrémenter le nbre d'étapes utilisant
+ la même liste.*/
+ ++_nsamelentitype;
+ /* ISCRUTE(_nsamelentitype); */
+ } else {
+ /*Si nos listes ne sont pas devenues les mêmes*/
+ /*Ds ce cas de figure l'étape de calcul concernée n'utilisait pas
+ * la liste de types d'entité du champ (il n'était pas comptabilisé dans le Nb. d'étapes de même liste d'entité).
+ * La nouvelle liste d'entité utilisée par cette étape n'est toujours pas devenue la même que celle du champ.
+ * Soit parcequ'il lui manque toujours certains type d'entités, soit parcequ'il utilise un nouveau type d'entité.
+ */
+ /* Si notre type d'entité n'appartenait pas à la liste globale initiale => 0 sinon on ne fait rien */
+ if (!_MEDtest32bits(_lentitytype1sav,_it) ) _nsamelentitype=0;
+ /* ISCRUTE(_nsamelentitype); */
+ }
+ }
+
+ if ( _nsamelentitypesav != _nsamelentitype ) {
+/* if ( forentity) */
+ if ( _MEDattributeIntWr(_gid,_attallname,&_nsamelentitype) < 0) {
+ MED_ERR_(_ret,MED_ERR_WRITE,MED_ERR_ATTRIBUTE,MED_ERR_FIELD_MSG);
+ SSCRUTE(fieldname);SSCRUTE(_attallname);goto ERROR;
+ }
+ }
+
+ _ret = 0;
+
+ ERROR:
+ return _ret;
+}
+

212
med.spec
View File

@ -1,27 +1,28 @@
Name: med Name: med
Version: 3.0.8 Version: 4.1.0
Release: 1%{?dist} Release: 10%{?dist}
Summary: Library to exchange meshed data Summary: Library to exchange meshed data
License: LGPLv3+ License: LGPLv3+
URL: http://www.code-aster.org/outils/med/ URL: http://www.salome-platform.org/user-section/about/med
Source0: http://files.salome-platform.org/Salome/other/%{name}-%{version}.tar.gz Source0: http://files.salome-platform.org/Salome/other/%{name}-%{version}.tar.gz
# Chars are unsigned on arm, but the tests do not appear to expect this # - Install headers in %%_includedir/med
# Patch generated via # - Install cmake config files to %%_libdir/cmake
# find . -type f -print0 | xargs -0 sed -i "s|-e 's/H5T_STD_I8LE//g'|-e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g'|g" # - Install doc to %%_pkgdocdir
Patch0: med-3.0.7_tests.patch Patch0: med_cmake.patch
%if 0%{?el6} # hdf5-1.12 compatibility
# Automake in el6 does not understand serial-tests # https://gist.githubusercontent.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47/raw/7482f9a42fdd277f5f9cf0167ea7a3381032ca7a/hdf5-1.12.patch
Patch1: med-3.0.7_serial-tests.patch Patch1: med-hdf5-1.12.patch
# Fix syntax in med_check_swig.m4
Patch2: med-3.0.7_check-swig.patch
%endif
BuildRequires: hdf5-devel BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
BuildRequires: hdf5-devel
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: swig BuildRequires: swig
BuildRequires: python2-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
# For autoreconf # For autoreconf
@ -34,12 +35,12 @@ and Data Exchange) is a library to store and exchange meshed data or
computation results. It uses the HDF5 file format to store the data. computation results. It uses the HDF5 file format to store the data.
%package -n python-%{name} %package -n python3-%{name}
Summary: Python bindings for %{name} Summary: Python3 bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python-%{name} %description -n python3-%{name}
The python-%{name} package contains python bindings for %{name}. The python3-%{name} package contains python3 bindings for %{name}.
%package tools %package tools
@ -58,6 +59,7 @@ This package contains runtime tools for %{name}:
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: cmake-filesystem
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
@ -73,12 +75,7 @@ The %{name}-doc package contains the documentation for %{name}.
%prep %prep
%setup -q -n %{name}-%{version}_SRC %autosetup -p1 -n %{name}-%{version}
%patch0 -p1
%if 0%{?el6}
%patch1 -p1
%patch2 -p1
%endif
# Fix file not utf8 # Fix file not utf8
iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.new && \ iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.new && \
@ -87,43 +84,23 @@ mv ChangeLog.new ChangeLog
%build %build
# To remove rpath %cmake -DMEDFILE_BUILD_PYTHON=1 \
autoreconf -ivf -DPYTHON_EXECUTABLE=%{__python3} \
%configure --disable-static -DPYTHON_INCLUDE_DIR=%{_includedir}/python%{python3_version}$(python3-config --abiflags)/ \
make %{?_smp_mflags} -DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_version}$(python3-config --abiflags).so
%cmake_build
%install %install
%make_install %cmake_install
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# Install docs through %%doc
mkdir installed_docs
mv %{buildroot}%{_docdir}/* installed_docs
# Remove configuration summary file
rm -f %{buildroot}%{_libdir}/libmed3.settings
# Remove test-suite files # Remove test-suite files
rm -rf %{buildroot}%{_bindir}/testc rm -rf %{buildroot}%{_bindir}/testc
rm -rf %{buildroot}%{_bindir}/usescases
rm -rf %{buildroot}%{_bindir}/unittests
rm -rf %{buildroot}%{_bindir}/testf rm -rf %{buildroot}%{_bindir}/testf
rm -rf %{buildroot}%{_bindir}/testpy rm -rf %{buildroot}%{_bindir}/testpy
# Fix symlinks to point to correct path
ln -sf %{_bindir}/mdump3 %{buildroot}%{_bindir}/mdump
ln -sf %{_bindir}/xmdump3 %{buildroot}%{_bindir}/xmdump
%check %check
make check %ctest || :
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
@ -132,23 +109,144 @@ make check
%{_libdir}/libmed.so.1* %{_libdir}/libmed.so.1*
%{_libdir}/libmedC.so.1* %{_libdir}/libmedC.so.1*
%{_libdir}/libmedimport.so.0* %{_libdir}/libmedimport.so.0*
%{_libdir}/libmedfwrap.so.11*
%files -n python-%{name} %files -n python3-%{name}
%{python_sitearch}/%{name}/ %{python3_sitearch}/%{name}/
%files tools %files tools
%{_bindir}/* %{_bindir}/*mdump*
%{_bindir}/medconforme
%{_bindir}/medimport
%files devel %files devel
%{_libdir}/*.so %{_libdir}/*.so
%{_includedir}/* %{_libdir}/cmake/MEDFile/
%{_includedir}/%{name}/
%files doc %files doc
%doc installed_docs/*
%license COPYING.LESSER %license COPYING.LESSER
%doc %{_pkgdocdir}
%changelog %changelog
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 4.1.0-9
- Rebuilt for Python 3.11
* Sat Mar 05 2022 Sandro Mani <manisandro@gmail.com> - 4.1.0-8
- Fix FTBFS with cmake 3.23.0
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Dec 03 2021 Sandro Mani <manisandro@gmail.com> - 4.1.0-3
- Port to hdf5-1.12
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 4.1.0-5
- Rebuild for hdf5 1.10.7
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.1.0-3
- Rebuilt for Python 3.10
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Jul 30 2020 Sandro Mani <manisandro@gmail.com> - 4.1-1
- Update to 4.1
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jun 25 2020 Orion Poplawski <orion@cora.nwra.com> - 4.0.0-8
- Rebuild for hdf5 1.10.6
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.0.0-7
- Rebuilt for Python 3.9
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 4.0.0-5
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.0.0-4
- Rebuilt for Python 3.8
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jun 03 2019 Charalampos Stratakis <cstratak@redhat.com> - 4.0.0-2
- Don't hard-code python's abi flags
* Wed Mar 13 2019 Sandro Mani <manisandro@gmail.com> - 4.0.0-1
- Update to 4.0.0
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Oct 03 2018 Miro Hrončok <mhroncok@redhat.com> - 3.3.1-4
- Remove python2 subpackage (#1627343)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.3.1-2
- Rebuilt for Python 3.7
* Fri Mar 09 2018 Sandro Mani <manisandro@gmail.com> - 3.3.1-1
- Update to 3.3.1
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Feb 05 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.2.1-4
- Rebuild for new gfortran
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat May 06 2017 Sandro Mani <manisandro@gmail.com> - 3.2.1-1
- Update to 3.2.1
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 3.2.0-2
- Rebuild (gfortran)
* Mon Oct 03 2016 Sandro Mani <manisandro@gmail.com> - 3.2.0-1
- Update to 3.2.0
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.0-2
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Sat Feb 06 2016 Sandro Mani <manisandro@gmail.com> - 3.1.0-1
- Update to 3.1.0
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jan 21 2016 Orion Poplawski <orion@cora.nwra.com> - 3.0.8-5
- Rebuild for hdf5 1.8.16
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 3.0.8-3
- Rebuild for hdf5 1.8.15
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.0.8-2
- Rebuilt for GCC 5 C++11 ABI change
* Wed Mar 25 2015 Sandro Mani <manisandro@gmail.com> - 3.0.8-1 * Wed Mar 25 2015 Sandro Mani <manisandro@gmail.com> - 3.0.8-1
- Update to 3.0.8 - Update to 3.0.8

64
med_cmake.patch Normal file
View File

@ -0,0 +1,64 @@
diff -rupN --no-dereference med-4.1.0/CMakeLists.txt med-4.1.0-new/CMakeLists.txt
--- med-4.1.0/CMakeLists.txt 2020-03-12 16:45:46.000000000 +0100
+++ med-4.1.0-new/CMakeLists.txt 2021-12-03 09:32:31.544994485 +0100
@@ -101,9 +101,9 @@ ENDIF(WIN32)
IF(WIN32 AND NOT CYGWIN)
SET(INSTALL_CMAKE_CONFIG_DIR cmake)
ELSE()
- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
+ SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/MEDFile)
ENDIF()
-SET(INSTALL_INCLUDE_DIR include)
+SET(INSTALL_INCLUDE_DIR include/med)
## Pre-requisites detection
# Detect HDF5 first to potentially retrieve MPI automatically:
@@ -144,8 +144,8 @@ ENDIF()
## Installation of the doc
IF(MEDFILE_INSTALL_DOC OR MEDFILE_BUILD_DOC)
- INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
- INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
+ INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
+ INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
ENDIF()
#######################
diff -rupN --no-dereference med-4.1.0/config/cmake_files/medMacros.cmake med-4.1.0-new/config/cmake_files/medMacros.cmake
--- med-4.1.0/config/cmake_files/medMacros.cmake 2020-01-30 17:04:19.000000000 +0100
+++ med-4.1.0-new/config/cmake_files/medMacros.cmake 2021-12-03 09:32:31.545994485 +0100
@@ -505,9 +505,9 @@ MACRO(INSTALL_AND_COMPILE_PYTHON_FILE PY
FOREACH(input ${PYFILE2COMPINST})
GET_FILENAME_COMPONENT(inputname ${input} NAME)
INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC})
- INSTALL(CODE "MESSAGE(STATUS \"py compiling \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
+# INSTALL(CODE "MESSAGE(STATUS \"py compiling \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
+# INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
+# INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
+# INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
ENDFOREACH(input ${PYFILE2COMPINST})
ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)
diff -rupN --no-dereference med-4.1.0/python/CMakeLists.txt med-4.1.0-new/python/CMakeLists.txt
--- med-4.1.0/python/CMakeLists.txt 2020-01-30 17:03:53.000000000 +0100
+++ med-4.1.0-new/python/CMakeLists.txt 2021-12-03 09:32:31.545994485 +0100
@@ -36,7 +36,7 @@ SET(_link_libs
${PYTHON_LIBRARIES}
)
-SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)
+SET(_install_dir lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)
# Ensure we will be able to run the Python tests from the build tree by outputing
# files into the package folder:
diff -rupN --no-dereference med-4.1.0/tools/medimport/CMakeLists.txt med-4.1.0-new/tools/medimport/CMakeLists.txt
--- med-4.1.0/tools/medimport/CMakeLists.txt 2020-03-12 16:45:46.000000000 +0100
+++ med-4.1.0-new/tools/medimport/CMakeLists.txt 2021-12-03 09:32:31.545994485 +0100
@@ -90,4 +90,4 @@ IF(NOT (WIN32 AND MEDFILE_BUILD_STATIC_L
INSTALL(TARGETS medimport DESTINATION bin )
ENDIF()
-INSTALL(FILES include/medimport_win_dll.h include/MEDimport.h include/MEDimport.hxx include/medimportcxx_win_dll.h DESTINATION include)
+INSTALL(FILES include/medimport_win_dll.h include/MEDimport.h include/MEDimport.hxx include/medimportcxx_win_dll.h DESTINATION ${INSTALL_INCLUDE_DIR})

View File

@ -1 +1 @@
4f514a352c9a256f678077eea99b75c5 med-3.0.8.tar.gz SHA512 (med-4.1.0.tar.gz) = 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8