Update to 3.2.1
This commit is contained in:
Sandro Mani
parent
aee2e4f5ed
commit
72d9504895
|
|
@ -2,3 +2,4 @@
|
|||
/med-3.0.8.tar.gz
|
||||
/med-3.1.0.tar.gz
|
||||
/med-3.2.0.tar.gz
|
||||
/med-3.2.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff -rupN med-3.1.0_SRC/include/H5public_extract.h.in med-3.1.0_SRC-new/include/H5public_extract.h.in
|
||||
--- med-3.1.0_SRC/include/H5public_extract.h.in 2015-09-07 18:56:22.000000000 +0200
|
||||
+++ med-3.1.0_SRC-new/include/H5public_extract.h.in 2016-02-06 11:32:36.966021123 +0100
|
||||
@@ -28,9 +28,9 @@ extern "C" {
|
||||
@HDF5_TYPEDEF_HID_T@
|
||||
@HDF5_TYPEDEF_HSIZE_T@
|
||||
|
||||
-#typedef int herr_t;
|
||||
-#typedef int hid_t;
|
||||
-#typedef unsigned long long hsize_t;
|
||||
+// typedef int herr_t;
|
||||
+// typedef int hid_t;
|
||||
+// typedef unsigned long long hsize_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
diff -rupN med-3.2.1_SRC/config/med_check_hdf5.m4 med-3.2.1_SRC-new/config/med_check_hdf5.m4
|
||||
--- med-3.2.1_SRC/config/med_check_hdf5.m4 2016-10-12 16:30:30.000000000 +0200
|
||||
+++ med-3.2.1_SRC-new/config/med_check_hdf5.m4 2017-05-06 18:53:52.479809393 +0200
|
||||
@@ -67,13 +67,13 @@ dnl #Vérify that the hdf5 directory str
|
||||
hdf5home_save=$hdf5home
|
||||
#if user has provided a specific hdf5 path for include or lib don't try to guess specific system path
|
||||
if test "x$with_hdf5_include" = "xno" && test "x$with_hdf5_lib" = "xno"; then
|
||||
- #Search for H5pubconf.h in $hdf5home and some other standard paths if user doesn't provide hdf5_include
|
||||
- # H5pubconf.h is used further to detect serial or parallel hdf5
|
||||
+ #Search for hdf5.h in $hdf5home and some other standard paths if user doesn't provide hdf5_include
|
||||
+ # hdf5.h is used further to detect serial or parallel hdf5
|
||||
#Cette approche ne prend pas en compte CPPFLAGS, inconvénient mineur de au vu du test d'arborescence précédent
|
||||
for hdf5home in "$hdf5home_save" "$hdf5home_save/lib/x86_64-linux-gnu/hdf5/serial/" "$hdf5home_save/lib/x86_64-linux-gnu/hdf5/parallel/"
|
||||
do
|
||||
- AC_MSG_NOTICE([Trying $hdf5home home path for searching H5pubconf.h file.])
|
||||
- test -e $hdf5home/include/H5pubconf.h && found_H5pubconf_h=yes && break
|
||||
+ AC_MSG_NOTICE([Trying $hdf5home home path for searching hdf5.h file.])
|
||||
+ test -e $hdf5home/include/hdf5.h && found_H5pubconf_h=yes && break
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -82,7 +82,7 @@ dnl #Vérify that the hdf5 directory str
|
||||
AC_MSG_ERROR([The directory hdf5 include |$hdf5include| doesn't exist, please verify either HDF5HOME, --with-hdf5=<path> or --with-hdf5-include])
|
||||
fi
|
||||
|
||||
- test ! "x$found_H5pubconf_h" = "xyes" || test -e ${hdf5include}/H5pubconf.h || AC_MSG_ERROR([Can't find H5pubconf.h file, please verify either HDF5HOME, --with-hdf5=<path> or --with-hdf5-include.])
|
||||
+ test ! "x$found_H5pubconf_h" = "xyes" || test -e ${hdf5include}/hdf5.h || AC_MSG_ERROR([Can't find hdf5.h file, please verify either HDF5HOME, --with-hdf5=<path> or --with-hdf5-include.])
|
||||
|
||||
test "x$with_hdf5_lib" = "xno" && hdf5lib=$hdf5home/lib || hdf5lib=$with_hdf5_lib
|
||||
if test ! -d "$hdf5lib" ; then
|
||||
@@ -106,7 +106,7 @@ AC_DEFUN([MED_CHECK_HDF5],dnl
|
||||
[
|
||||
#La localisation d'hdf5 doit être établie avant
|
||||
AC_REQUIRE([_MED_BEFORE_ENABLE_PMED])
|
||||
-#de tester l'aspect parallel de la bibliothèque (H5pubconf.h).
|
||||
+#de tester l'aspect parallel de la bibliothèque (hdf5.h).
|
||||
AC_REQUIRE([MED_ENABLE_PMED])
|
||||
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
15
med.spec
15
med.spec
|
|
@ -1,18 +1,18 @@
|
|||
Name: med
|
||||
Version: 3.2.0
|
||||
Release: 3%{?dist}
|
||||
Version: 3.2.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Library to exchange meshed data
|
||||
|
||||
License: LGPLv3+
|
||||
URL: http://www.code-aster.org/V2/spip.php?article275
|
||||
URL: http://files.salome-platform.org/Salome/other/med-3.2.1.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
|
||||
# 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
|
||||
# Remove code with invalid syntax (probably was meant to be commented)
|
||||
Patch1: med-3.1.0_invalid-syntax.patch
|
||||
# Look for hdf5.h when location hdf5, H5pubconf.h name is arch-dependent on Fedora (i.e. H5pubconf-64.h)
|
||||
Patch1: med-3.2.1_hdf5.patch
|
||||
%if 0%{?el6}
|
||||
# Automake in el6 does not understand serial-tests
|
||||
Patch2: med-3.0.7_serial-tests.patch
|
||||
|
|
@ -77,7 +77,7 @@ The %{name}-doc package contains the documentation for %{name}.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%setup -q -n %{name}-%{version}_SRC
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%if 0%{?el6}
|
||||
|
|
@ -156,6 +156,9 @@ make check
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue