diff --git a/.gitignore b/.gitignore index 51c86d5..fc7d5a1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /render-5.11.0-beta-1.zip /libsbml-svn22272.tar.gz /render-5.11.4-beta-1.zip +/render-5.11.6-beta-1.zip diff --git a/libsbml.spec b/libsbml.spec index 1dff7fa..aa0be3e 100644 --- a/libsbml.spec +++ b/libsbml.spec @@ -1,5 +1,5 @@ -%global checkout 22272 -%global date 20150528 +#%%global checkout 22272 +#%%global date 20150528 %bcond_without perl %bcond_without ruby @@ -8,10 +8,12 @@ %bcond_without python3 %bcond_without python2 -##ARM arches are not supported by upstream -%ifnarch %{arm} aarch64 +##Arches not supported by upstream +%if 0%{?fedora} > 22 +%ifnarch %{arm} aarch64 s390x ppc64 ppc64le %bcond_without check %endif +%endif %ifarch %{mono_arches} %bcond_without mono @@ -40,9 +42,9 @@ %global _docdir_fmt %{name} Name: libsbml -Version: 5.11.5 -#Release: 1%{?dist} -Release: 0.12.%{date}svn%{checkout}%{?dist} +Version: 5.11.6 +Release: 2%{?dist} +#Release: 0.1.%%{date}svn%%{checkout}%%{?dist} Summary: Systems Biology Markup Language library License: LGPLv2+ @@ -51,9 +53,9 @@ URL: http://sbml.org/Software/libSBML ## Source archive from svn #22272; obtained by: ## svn checkout http://svn.code.sf.net/p/sbml/code/trunk/libsbml sbml-code ## tar -czvf libsbml-svn22272.tar.gz sbml-code -Source0: libsbml-svn%{checkout}.tar.gz -#Source0: http://downloads.sourceforge.net/project/sbml/libsbml/%%{version}/stable/libSBML-%%{version}-core-src.zip -Source1: http://sourceforge.net/projects/sbml/files/libsbml/5.11.4/experimental/source/render-5.11.4-beta-1.zip +#Source0: libsbml-svn%%{checkout}.tar.gz +Source0: http://sourceforge.net/projects/sbml/files/libsbml/%{version}-experimental/source/libSBML-%{version}-core-src.tar.gz +Source1: http://sourceforge.net/projects/sbml/files/libsbml/%{version}-experimental/source/beta%20packages/render-%{version}-beta-1.zip ## Unbundle minizip Patch0: libsbml-use-system-minizip-cmake.patch @@ -205,7 +207,7 @@ This package contains %{summary}. %endif %prep -%autosetup -n sbml-code -p1 +%autosetup -n libsbml-5.11.6 -p1 sed -i -r 's/DOXYGEN_MAX_VERSION=1\.8\.8/DOXYGEN_MAX_VERSION=1.8.9/' configure @@ -364,10 +366,18 @@ install -Dm0644 src/bindings/ruby/README.txt %{buildroot}%{_pkgdocdir}/README-ru %check %if %{with python2} export CK_FORK=no -make -C build2 check CTEST_OUTPUT_ON_FAILURE=TRUE +make -C build2 check %endif cd build -ctest --force-new-ctest-process -V -E "test_ruby_binding" CTEST_OUTPUT_ON_FAILURE=TRUE +%ifarch ppc64 ppc64le +ctest --force-new-ctest-process -V -E "test_ruby_binding" +%endif +%ifarch %{arm} +ctest --force-new-ctest-process -V -E "test_csharp_bindings_full" +%endif +%ifnarch %{arm} ppc64 ppc64le +ctest --force-new-ctest-process -V +%endif %endif %post -p /sbin/ldconfig @@ -456,6 +466,15 @@ ctest --force-new-ctest-process -V -E "test_ruby_binding" CTEST_OUTPUT_ON_FAILUR %changelog +* Thu Jul 23 2015 Antonio Trande - 5.11.6-2 +- Some tests disabled + +* Thu Jul 23 2015 Antonio Trande - 5.11.6-1 +- Bump to the release 5.11.6 (experimental) + +* Wed Jul 22 2015 Antonio Trande - 5.11.5-0.13.20150528svn22272 +- Tests disabled on PPC s390x arches + * Sat Jul 18 2015 Antonio Trande - 5.11.5-0.12.20150528svn22272 - Tests disabled on ARM aarch64 diff --git a/sources b/sources index b0f6f0a..e06b468 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -90ed4e9d975db24f748ab5f71d98084f libsbml-svn22272.tar.gz -550f5e112a0c5e966d98e22b3dc26211 render-5.11.4-beta-1.zip +fbaac09c520d562b7d2dbfb35b157b1a libSBML-5.11.6-core-src.tar.gz +a9a4003f983a786bf11b21ef764ee367 render-5.11.6-beta-1.zip