From d84894e5b20bf78fd8c8692016ba99b666f9880f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jan 03 2015 18:26:16 +0000 Subject: Make el6 compatible --- diff --git a/med-3.0.7_check-swig.patch b/med-3.0.7_check-swig.patch new file mode 100644 index 0000000..15cca54 --- /dev/null +++ b/med-3.0.7_check-swig.patch @@ -0,0 +1,12 @@ +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) diff --git a/med-3.0.7_serial-tests.patch b/med-3.0.7_serial-tests.patch new file mode 100644 index 0000000..0baf2f3 --- /dev/null +++ b/med-3.0.7_serial-tests.patch @@ -0,0 +1,12 @@ +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) diff --git a/med.spec b/med.spec index 93b4277..d4cbf38 100644 --- a/med.spec +++ b/med.spec @@ -11,11 +11,18 @@ Source0: http://files.salome-platform.org/Salome/other/%{name}-%{version} # 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 +%if 0%{?el6} +# Automake in el6 does not understand serial-tests +Patch1: med-3.0.7_serial-tests.patch +# Fix syntax in med_check_swig.m4 +Patch2: med-3.0.7_check-swig.patch +%endif BuildRequires: hdf5-devel BuildRequires: gcc-gfortran BuildRequires: swig BuildRequires: python2-devel +BuildRequires: zlib-devel # For autoreconf BuildRequires: autoconf automake libtool @@ -66,7 +73,12 @@ The %{name}-doc package contains the documentation for %{name}. %prep -%autosetup -p1 -n %{name}-%{version}_SRC +%setup -q -n %{name}-%{version}_SRC +%patch0 -p1 +%if 0%{?el6} +%patch1 -p1 +%patch2 -p1 +%endif # Fix file not utf8 iconv --from=ISO-8859-1 --to=UTF-8 ChangeLog > ChangeLog.new && \