Update to 4.0.0
This commit is contained in:
parent
0ee9deeb57
commit
12b90d88e1
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/med-3.2.0.tar.gz
|
||||
/med-3.2.1.tar.gz
|
||||
/med-3.3.1.tar.gz
|
||||
/med-4.0.0.tar.gz
|
||||
|
@ -1,152 +0,0 @@
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn med-3.3.1_SRC-new/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn 2018-02-19 13:09:47.226923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn med-3.3.1_SRC-new/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn 2018-02-19 13:09:47.226923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn med-3.3.1_SRC-new/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn 2018-02-19 13:09:47.226923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/Test_MEDmeshStructElementVarAttWr.shn med-3.3.1_SRC-new/tests/unittests/c/Test_MEDmeshStructElementVarAttWr.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/Test_MEDmeshStructElementVarAttWr.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/Test_MEDmeshStructElementVarAttWr.shn 2018-02-19 13:09:47.226923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/Test_MEDstructElementConstAttWithProfileWr.shn med-3.3.1_SRC-new/tests/unittests/c/Test_MEDstructElementConstAttWithProfileWr.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/Test_MEDstructElementConstAttWithProfileWr.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/Test_MEDstructElementConstAttWithProfileWr.shn 2018-02-19 13:09:47.226923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/Test_MEDstructElementCr.shn med-3.3.1_SRC-new/tests/unittests/c/Test_MEDstructElementCr.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/Test_MEDstructElementCr.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/Test_MEDstructElementCr.shn 2018-02-19 13:09:47.226923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/Test_MEDstructElementVarAttCr.shn med-3.3.1_SRC-new/tests/unittests/c/Test_MEDstructElementVarAttCr.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/Test_MEDstructElementVarAttCr.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/Test_MEDstructElementVarAttCr.shn 2018-02-19 13:09:47.227923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-3.3.1_SRC/tests/unittests/c/Test_MEDsupportMesh.shn med-3.3.1_SRC-new/tests/unittests/c/Test_MEDsupportMesh.shn
|
||||
--- med-3.3.1_SRC/tests/unittests/c/Test_MEDsupportMesh.shn 2016-04-14 18:27:40.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/unittests/c/Test_MEDsupportMesh.shn 2018-02-19 13:09:47.227923600 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
53
med.spec
53
med.spec
@ -1,6 +1,6 @@
|
||||
Name: med
|
||||
Version: 3.3.1
|
||||
Release: 5%{?dist}
|
||||
Version: 4.0.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Library to exchange meshed data
|
||||
|
||||
License: LGPLv3+
|
||||
@ -10,13 +10,12 @@ Source0: http://files.salome-platform.org/Salome/other/%{name}-%{version}
|
||||
# Chars are unsigned on arm, but the tests do not appear to expect this
|
||||
# Patch generated via
|
||||
# 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"
|
||||
Patch0: med-3.0.7_tests.patch
|
||||
Patch0: med_tests.patch
|
||||
# - Install headers in %%_includedir/med
|
||||
# - Comment out missing test
|
||||
# - Set library version
|
||||
# - Use LIB_SUFFIX
|
||||
# - Install cmake config files to %%_libdir/cmake
|
||||
Patch1: med-3.3.1_cmake.patch
|
||||
# - Install doc to %%_pkgdocdir
|
||||
Patch1: med_cmake.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
@ -78,7 +77,7 @@ The %{name}-doc package contains the documentation for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}_SRC
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
|
||||
# Fix file not utf8
|
||||
iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.new && \
|
||||
@ -87,57 +86,33 @@ mv ChangeLog.new ChangeLog
|
||||
|
||||
|
||||
%build
|
||||
# https://autotools.io/libtool/version.html
|
||||
# -> On linux, current:revision:age translates to lib version (current-age).age.revision
|
||||
libmedCRA=`grep -E "libmed_la_LDFLAGS.*version-info\s+([0-9]+:[0-9]+:[0-9]+)" src/Makefile.am | grep -Eo "[0-9]+:[0-9]+:[0-9]+"`
|
||||
libmedSOVER=`echo $libmedCRA | awk -F':' '{print $1-$3}'`
|
||||
libmedLIBVER=`echo $libmedCRA | awk -F':' '{print $1-$3"."$3"."$2}'`
|
||||
libmedcCRA=`grep -E "libmedC_la_LDFLAGS.*version-info\s+([0-9]+:[0-9]+:[0-9]+)" src/Makefile.am | grep -Eo "[0-9]+:[0-9]+:[0-9]+"`
|
||||
libmedcSOVER=`echo $libmedcCRA | awk -F':' '{print $1-$3}'`
|
||||
libmedcLIBVER=`echo $libmedcCRA | awk -F':' '{print $1-$3"."$3"."$2}'`
|
||||
libmedimportCRA=`grep -E "libmedimport_la_LDFLAGS.*version-info\s+([0-9]+:[0-9]+:[0-9]+)" tools/medimport/Makefile.am | grep -Eo "[0-9]+:[0-9]+:[0-9]+"`
|
||||
libmedimportSOVER=`echo $libmedimportCRA | awk -F':' '{print $1-$3}'`
|
||||
libmedimportLIBVER=`echo $libmedimportCRA | awk -F':' '{print $1-$3"."$3"."$2}'`
|
||||
|
||||
mkdir build_py3
|
||||
pushd build_py3
|
||||
%cmake -DMEDFILE_BUILD_PYTHON=1 \
|
||||
-DPYTHON_EXECUTABLE=%{__python3} \
|
||||
-DPYTHON_INCLUDE_DIR=%{_includedir}/python%{python3_version}m/ \
|
||||
-DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_version}m.so \
|
||||
-DLIBMED_SOVER=$libmedSOVER -DLIBMED_LIBVER=$libmedLIBVER \
|
||||
-DLIBMEDC_SOVER=$libmedcSOVER -DLIBMEDC_LIBVER=$libmedcLIBVER \
|
||||
-DLIBMEDIMPORT_SOVER=$libmedimportSOVER -DLIBMEDIMPORT_LIBVER=$libmedimportLIBVER ..
|
||||
-DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_version}m.so .
|
||||
%make_build
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
%make_install -C build_py3
|
||||
|
||||
# Install docs through %%doc
|
||||
mkdir installed_docs
|
||||
mv %{buildroot}%{_docdir}/* installed_docs
|
||||
%make_install
|
||||
|
||||
# Remove test-suite files
|
||||
rm -rf %{buildroot}%{_bindir}/testc
|
||||
rm -rf %{buildroot}%{_bindir}/testf
|
||||
rm -rf %{buildroot}%{_bindir}/testpy
|
||||
|
||||
|
||||
%check
|
||||
make check -C build_py3 || :
|
||||
|
||||
ctest -V || :
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog README
|
||||
%license COPYING.LESSER
|
||||
%{_libdir}/libmed.so.1*
|
||||
%{_libdir}/libmedC.so.1*
|
||||
%{_libdir}/libmedimport.so.0*
|
||||
%{_libdir}/libmedfwrap.so.11.*
|
||||
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitearch}/%{name}/
|
||||
@ -149,21 +124,23 @@ make check -C build_py3 || :
|
||||
|
||||
%files devel
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/libmedfwrap.a
|
||||
%{_libdir}/cmake/MEDFile/
|
||||
%{_includedir}/%{name}/
|
||||
|
||||
%files doc
|
||||
%doc installed_docs/*
|
||||
%license COPYING.LESSER
|
||||
%doc %{_pkgdocdir}
|
||||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
- Remvoe python2 subpackage (#1627343)
|
||||
- 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
|
||||
|
@ -1,11 +1,11 @@
|
||||
diff -rupN med-3.3.1_SRC/CMakeLists.txt med-3.3.1_SRC-new/CMakeLists.txt
|
||||
--- med-3.3.1_SRC/CMakeLists.txt 2017-10-31 17:16:37.000000000 +0100
|
||||
+++ med-3.3.1_SRC-new/CMakeLists.txt 2018-03-09 23:47:41.350576393 +0100
|
||||
@@ -81,9 +81,9 @@ ENDIF(WIN32)
|
||||
diff -rupN med-4.0.0/CMakeLists.txt med-4.0.0-new/CMakeLists.txt
|
||||
--- med-4.0.0/CMakeLists.txt 2018-12-10 18:41:59.000000000 +0100
|
||||
+++ med-4.0.0-new/CMakeLists.txt 2019-03-13 10:59:52.543842255 +0100
|
||||
@@ -92,9 +92,9 @@ ENDIF(WIN32)
|
||||
IF(WIN32 AND NOT CYGWIN)
|
||||
SET(INSTALL_CMAKE_CONFIG_DIR cmake)
|
||||
ELSE()
|
||||
- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/${PROJECT_NAME})
|
||||
- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
|
||||
+ SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/${PROJECT_NAME})
|
||||
ENDIF()
|
||||
-SET(INSTALL_INCLUDE_DIR include)
|
||||
@ -13,10 +13,21 @@ diff -rupN med-3.3.1_SRC/CMakeLists.txt med-3.3.1_SRC-new/CMakeLists.txt
|
||||
|
||||
## Pre-requisites detection
|
||||
# Detect HDF5 first to potentially retrieve MPI automatically:
|
||||
diff -rupN med-3.3.1_SRC/config/cmake_files/medMacros.cmake med-3.3.1_SRC-new/config/cmake_files/medMacros.cmake
|
||||
--- med-3.3.1_SRC/config/cmake_files/medMacros.cmake 2017-10-11 15:02:22.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/config/cmake_files/medMacros.cmake 2018-03-09 23:39:44.704602757 +0100
|
||||
@@ -455,9 +455,9 @@ MACRO(INSTALL_AND_COMPILE_PYTHON_FILE PY
|
||||
@@ -135,8 +135,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 med-4.0.0/config/cmake_files/medMacros.cmake med-4.0.0-new/config/cmake_files/medMacros.cmake
|
||||
--- med-4.0.0/config/cmake_files/medMacros.cmake 2018-11-05 13:49:21.000000000 +0100
|
||||
+++ med-4.0.0-new/config/cmake_files/medMacros.cmake 2019-03-12 18:58:06.528045176 +0100
|
||||
@@ -456,9 +456,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})
|
||||
@ -30,10 +41,10 @@ diff -rupN med-3.3.1_SRC/config/cmake_files/medMacros.cmake med-3.3.1_SRC-new/co
|
||||
+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
|
||||
ENDFOREACH(input ${PYFILE2COMPINST})
|
||||
ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)
|
||||
diff -rupN med-3.3.1_SRC/python/CMakeLists.txt med-3.3.1_SRC-new/python/CMakeLists.txt
|
||||
--- med-3.3.1_SRC/python/CMakeLists.txt 2017-07-10 14:50:32.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/python/CMakeLists.txt 2018-03-09 23:39:44.704602757 +0100
|
||||
@@ -35,7 +35,7 @@ SET(_link_libs
|
||||
diff -rupN med-4.0.0/python/CMakeLists.txt med-4.0.0-new/python/CMakeLists.txt
|
||||
--- med-4.0.0/python/CMakeLists.txt 2018-11-05 13:49:21.000000000 +0100
|
||||
+++ med-4.0.0-new/python/CMakeLists.txt 2019-03-12 18:58:06.528045176 +0100
|
||||
@@ -36,7 +36,7 @@ SET(_link_libs
|
||||
${PYTHON_LIBRARIES}
|
||||
)
|
||||
|
||||
@ -42,15 +53,11 @@ diff -rupN med-3.3.1_SRC/python/CMakeLists.txt med-3.3.1_SRC-new/python/CMakeLis
|
||||
|
||||
# Ensure we will be able to run the Python tests from the build tree by outputing
|
||||
# files into the package folder:
|
||||
diff -rupN med-3.3.1_SRC/src/CMakeLists.txt med-3.3.1_SRC-new/src/CMakeLists.txt
|
||||
--- med-3.3.1_SRC/src/CMakeLists.txt 2016-04-14 18:27:38.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/src/CMakeLists.txt 2018-03-09 23:43:23.198590672 +0100
|
||||
@@ -77,10 +77,11 @@ SET(_export_group "medfileTargets")
|
||||
######### Shared Libraries ##########
|
||||
IF(MEDFILE_BUILD_SHARED_LIBS)
|
||||
ADD_LIBRARY(medC SHARED ${medC_SOURCES})
|
||||
+ SET_TARGET_PROPERTIES(medC PROPERTIES VERSION ${LIBMEDC_LIBVER} SOVERSION ${LIBMEDC_SOVER})
|
||||
TARGET_LINK_LIBRARIES(medC ${HDF5_LIBRARIES} ${MPI_LIBS})
|
||||
diff -rupN med-4.0.0/src/CMakeLists.txt med-4.0.0-new/src/CMakeLists.txt
|
||||
--- med-4.0.0/src/CMakeLists.txt 2018-12-10 18:41:59.000000000 +0100
|
||||
+++ med-4.0.0-new/src/CMakeLists.txt 2019-03-12 18:58:06.530045174 +0100
|
||||
@@ -83,7 +83,7 @@ IF(MEDFILE_BUILD_SHARED_LIBS)
|
||||
TARGET_LINK_LIBRARIES(medC ${HDF5_LIBS} ${MPI_LIBS})
|
||||
MED_SET_DEFINITIONS(medC NOGDI)
|
||||
|
||||
- INSTALL(TARGETS medC EXPORT ${_export_group} DESTINATION lib)
|
||||
@ -58,8 +65,8 @@ diff -rupN med-3.3.1_SRC/src/CMakeLists.txt med-3.3.1_SRC-new/src/CMakeLists.txt
|
||||
ENDIF()
|
||||
|
||||
######### Static Libraries ##########
|
||||
@@ -94,7 +95,7 @@ IF(MEDFILE_BUILD_STATIC_LIBS)
|
||||
TARGET_LINK_LIBRARIES(medC_static ${HDF5_LIBRARIES} ${MPI_LIBS})
|
||||
@@ -97,7 +97,7 @@ IF(MEDFILE_BUILD_STATIC_LIBS)
|
||||
TARGET_LINK_LIBRARIES(medC_static ${HDF5_LIBS} ${MPI_LIBS})
|
||||
MED_SET_DEFINITIONS(medC_static NOGDI)
|
||||
|
||||
- INSTALL(TARGETS medC_static EXPORT ${_export_group} DESTINATION lib)
|
||||
@ -67,16 +74,16 @@ diff -rupN med-3.3.1_SRC/src/CMakeLists.txt med-3.3.1_SRC-new/src/CMakeLists.txt
|
||||
ENDIF()
|
||||
|
||||
########################### Fortran stuff ###################################
|
||||
@@ -107,14 +108,15 @@ IF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
## if we want the Fortran wrapper to build correctly under win.
|
||||
ADD_LIBRARY(medfwrap STATIC ${medfort_wrap_SOURCES})
|
||||
@@ -113,7 +113,7 @@ IF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
VERSION 11.0.0
|
||||
SOVERSION 11.0.0)
|
||||
TARGET_LINK_LIBRARIES(medfwrap medC)
|
||||
- INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib)
|
||||
+ INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
|
||||
|
||||
# Add Shared MED library
|
||||
ADD_LIBRARY(med SHARED MEDiterators.c)
|
||||
+ SET_TARGET_PROPERTIES(med PROPERTIES VERSION ${LIBMED_LIBVER} SOVERSION ${LIBMED_SOVER})
|
||||
@@ -124,7 +124,7 @@ IF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
TARGET_LINK_LIBRARIES(med medfwrap)
|
||||
|
||||
# Install only the resulting library:
|
||||
@ -85,7 +92,7 @@ diff -rupN med-3.3.1_SRC/src/CMakeLists.txt med-3.3.1_SRC-new/src/CMakeLists.txt
|
||||
ENDIF()
|
||||
|
||||
######### Static Libraries ##########
|
||||
@@ -127,7 +129,7 @@ IF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
@@ -137,7 +137,7 @@ IF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
ADD_LIBRARY(medfwrap_static STATIC ${medfort_wrap_SOURCES})
|
||||
SET_TARGET_PROPERTIES(medfwrap_static PROPERTIES OUTPUT_NAME medfwrap)
|
||||
TARGET_LINK_LIBRARIES(medfwrap_static medC_static)
|
||||
@ -94,7 +101,7 @@ diff -rupN med-3.3.1_SRC/src/CMakeLists.txt med-3.3.1_SRC-new/src/CMakeLists.txt
|
||||
|
||||
# Add Static MED library
|
||||
ADD_LIBRARY(med_static STATIC MEDiterators.c)
|
||||
@@ -135,7 +137,7 @@ IF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
@@ -145,7 +145,7 @@ IF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
TARGET_LINK_LIBRARIES(med_static medfwrap_static)
|
||||
|
||||
# Install only the resulting library:
|
||||
@ -103,27 +110,11 @@ diff -rupN med-3.3.1_SRC/src/CMakeLists.txt med-3.3.1_SRC-new/src/CMakeLists.txt
|
||||
ENDIF()
|
||||
|
||||
ENDIF(CMAKE_Fortran_COMPILER_WORKS)
|
||||
diff -rupN med-3.3.1_SRC/tests/python/CMakeLists.txt med-3.3.1_SRC-new/tests/python/CMakeLists.txt
|
||||
--- med-3.3.1_SRC/tests/python/CMakeLists.txt 2016-04-17 21:27:12.000000000 +0200
|
||||
+++ med-3.3.1_SRC-new/tests/python/CMakeLists.txt 2018-03-09 23:39:44.705602757 +0100
|
||||
@@ -1,5 +1,5 @@
|
||||
SET(_tst_scripts
|
||||
- test10.py
|
||||
+ #test10.py
|
||||
test11.py
|
||||
test12.py
|
||||
test13.py
|
||||
diff -rupN med-3.3.1_SRC/tools/medimport/CMakeLists.txt med-3.3.1_SRC-new/tools/medimport/CMakeLists.txt
|
||||
--- med-3.3.1_SRC/tools/medimport/CMakeLists.txt 2017-10-31 16:32:12.000000000 +0100
|
||||
+++ med-3.3.1_SRC-new/tools/medimport/CMakeLists.txt 2018-03-09 23:48:14.453574562 +0100
|
||||
@@ -48,12 +48,13 @@ SET(medimport_static_SOURCES
|
||||
# Shared version
|
||||
IF(MEDFILE_BUILD_SHARED_LIBS)
|
||||
ADD_LIBRARY(medimportengine SHARED ${medimport_SOURCES})
|
||||
+ SET_TARGET_PROPERTIES(medimportengine PROPERTIES VERSION ${LIBMEDIMPORT_LIBVER} SOVERSION ${LIBMEDIMPORT_SOVER})
|
||||
IF(WIN32)
|
||||
MED_SET_DEFINITIONS(medimportengine medimport_EXPORTS MEDIMPORTCXX_DLL_EXPORTS)
|
||||
ENDIF()
|
||||
diff -rupN med-4.0.0/tools/medimport/CMakeLists.txt med-4.0.0-new/tools/medimport/CMakeLists.txt
|
||||
--- med-4.0.0/tools/medimport/CMakeLists.txt 2018-12-10 18:41:59.000000000 +0100
|
||||
+++ med-4.0.0-new/tools/medimport/CMakeLists.txt 2019-03-12 18:58:06.530045174 +0100
|
||||
@@ -56,7 +56,7 @@ IF(MEDFILE_BUILD_SHARED_LIBS)
|
||||
SOVERSION 0.3.0)
|
||||
TARGET_LINK_LIBRARIES(medimportengine medC)
|
||||
SET_TARGET_PROPERTIES(medimportengine PROPERTIES OUTPUT_NAME medimport)
|
||||
- INSTALL(TARGETS medimportengine DESTINATION lib)
|
||||
@ -131,7 +122,7 @@ diff -rupN med-3.3.1_SRC/tools/medimport/CMakeLists.txt med-3.3.1_SRC-new/tools/
|
||||
SET(_lib_to_link "medimportengine")
|
||||
ENDIF()
|
||||
|
||||
@@ -63,7 +64,7 @@ IF(MEDFILE_BUILD_STATIC_LIBS)
|
||||
@@ -66,7 +66,7 @@ IF(MEDFILE_BUILD_STATIC_LIBS)
|
||||
TARGET_LINK_LIBRARIES(medimportengine_static medC_static)
|
||||
MED_SET_DEFINITIONS(medimportengine_static MED3_USESTATIC)
|
||||
SET_TARGET_PROPERTIES(medimportengine_static PROPERTIES OUTPUT_NAME medimport)
|
||||
@ -140,7 +131,7 @@ diff -rupN med-3.3.1_SRC/tools/medimport/CMakeLists.txt med-3.3.1_SRC-new/tools/
|
||||
# Give precendence to the shared object for the linking of
|
||||
# the executable medimport:
|
||||
IF(NOT _lib_to_link)
|
||||
@@ -84,4 +85,4 @@ IF(NOT (WIN32 AND MEDFILE_BUILD_STATIC_L
|
||||
@@ -87,4 +87,4 @@ IF(NOT (WIN32 AND MEDFILE_BUILD_STATIC_L
|
||||
INSTALL(TARGETS medimport DESTINATION bin )
|
||||
ENDIF()
|
||||
|
95
med_tests.patch
Normal file
95
med_tests.patch
Normal file
@ -0,0 +1,95 @@
|
||||
diff -rupN med-4.0.0/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn med-4.0.0-new/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn
|
||||
--- med-4.0.0/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn 2017-07-10 16:24:11.000000000 +0200
|
||||
+++ med-4.0.0-new/tests/unittests/c/MEDinterp/Test_MEDfieldInterpWr.shn 2018-12-25 12:03:35.385823247 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-4.0.0/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn med-4.0.0-new/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn
|
||||
--- med-4.0.0/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn 2017-07-10 16:24:11.000000000 +0200
|
||||
+++ med-4.0.0-new/tests/unittests/c/MEDinterp/Test_MEDinterpBaseFunctionWr.shn 2018-12-25 12:03:35.386823244 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-4.0.0/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn med-4.0.0-new/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn
|
||||
--- med-4.0.0/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn 2017-07-10 16:24:11.000000000 +0200
|
||||
+++ med-4.0.0-new/tests/unittests/c/MEDinterp/Test_MEDinterpCr.shn 2018-12-25 12:03:35.386823244 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-4.0.0/tests/unittests/c/Test_MEDstructElementCr.shn med-4.0.0-new/tests/unittests/c/Test_MEDstructElementCr.shn
|
||||
--- med-4.0.0/tests/unittests/c/Test_MEDstructElementCr.shn 2017-07-10 16:24:11.000000000 +0200
|
||||
+++ med-4.0.0-new/tests/unittests/c/Test_MEDstructElementCr.shn 2018-12-25 12:03:35.386823244 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
||||
diff -rupN med-4.0.0/tests/unittests/c/Test_MEDsupportMesh.shn med-4.0.0-new/tests/unittests/c/Test_MEDsupportMesh.shn
|
||||
--- med-4.0.0/tests/unittests/c/Test_MEDsupportMesh.shn 2017-07-10 16:24:11.000000000 +0200
|
||||
+++ med-4.0.0-new/tests/unittests/c/Test_MEDsupportMesh.shn 2018-12-25 12:03:35.386823244 +0100
|
||||
@@ -7,13 +7,13 @@ ${H5DUMP} ${BUILDDIR}/${file}.med > ${BU
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/${file}.dump > ${BUILDDIR}/${file}.dump.tmp && \
|
||||
sed -e 's/H5T_STD_I32BE//g' -e 's/H5T_STD_I32LE//g' \
|
||||
-e 's/H5T_STD_I64BE//g' -e 's/H5T_STD_I64LE//g' \
|
||||
-e 's/H5T_IEEE_F64BE//g' -e 's/H5T_IEEE_F64LE//g' \
|
||||
- -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
+ -e 's/H5T_STD_I8LE//g' -e 's/H5T_STD_U8LE//g' -e 's/H5T_STD_I8BE//g' -e 's/H5T_STD_U8BE//g' \
|
||||
-e 's/HDF5.*{//g' \
|
||||
${BUILDDIR}/dumps.ref/${file}.dump > ${BUILDDIR}/${file}.dump.ref && \
|
||||
diff ${BUILDDIR}/${file}.dump.ref ${BUILDDIR}/${file}.dump.tmp && \
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (med-3.3.1.tar.gz) = f1eba3bc69520b862bdab89ce76694f91ed0e6be42c037df8ec655b6314e8ae776083d5ead61fb34097eb8440302969229d1859b6d8fcce51e7551b75d8ebf5f
|
||||
SHA512 (med-4.0.0.tar.gz) = 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
|
||||
|
Loading…
Reference in New Issue
Block a user