From e2d93d35508bdb19f081d0e6938ae70910a14c0d Mon Sep 17 00:00:00 2001 From: sagitter Date: Jun 06 2018 08:21:26 +0000 Subject: Update to 5.17.0 --- diff --git a/.gitignore b/.gitignore index 22d7447..0b35f3b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /render-5.15.0-beta-1.zip /libSBML-5.16.0-core-plus-packages-src.tar.gz /render-5.16.0-beta-1.zip +/libSBML-5.17.0-core-plus-packages-src.tar.gz +/libSBML-5.17.0-render-src.zip diff --git a/libsbml-fix_install_libpaths.patch b/libsbml-fix_install_libpaths.patch index fed4928..42acbc6 100644 --- a/libsbml-fix_install_libpaths.patch +++ b/libsbml-fix_install_libpaths.patch @@ -1,15 +1,4 @@ ##This patch sets libraries' installation paths according to the Fedora packaging guidelines ---- a/CMakeLists.orig.txt 2017-03-15 13:01:27.000000000 +0100 -+++ b/CMakeLists.txt 2017-03-15 22:31:43.084298325 +0100 -@@ -94,7 +94,7 @@ - set(PACKAGE_VERSION "${LIBSBML_VERSION_MAJOR}.${LIBSBML_VERSION_MINOR}.${LIBSBML_VERSION_PATCH}${LIBSBML_VERSION_RELEASE}") - set(PACKAGE_NAME "libSBML") - --set(PACKAGE_CONFIG_DIR lib/cmake CACHE PATH -+set(PACKAGE_CONFIG_DIR ${LIB_INSTALL_DIR}/cmake CACHE PATH - "Path into which the cmake config files should be installed") - - --- a/src/bindings/ruby/CMakeLists.orig.txt 2014-11-26 13:31:14.000000000 +0100 +++ b/src/bindings/ruby/CMakeLists.txt 2014-12-28 23:25:47.035666311 +0100 @@ -177,7 +177,7 @@ diff --git a/libsbml-use-system-minizip-cmake.patch b/libsbml-use-system-minizip-cmake.patch index 3525444..0ca30cf 100644 --- a/libsbml-use-system-minizip-cmake.patch +++ b/libsbml-use-system-minizip-cmake.patch @@ -1,6 +1,6 @@ --- CMakeLists.orig.txt 2017-03-15 13:01:27.623725000 +0100 +++ CMakeLists.txt 2017-03-15 14:12:22.247705049 +0100 -@@ -696,6 +696,8 @@ +@@ -764,6 +764,8 @@ valid. It should contain the file zlib.h, but it does not.") endif() @@ -11,7 +11,7 @@ --- src/CMakeLists.orig.txt 2017-03-15 13:01:26.507732000 +0100 +++ src/CMakeLists.txt 2017-03-15 14:15:49.173159496 +0100 -@@ -354,14 +354,6 @@ +@@ -353,14 +353,6 @@ if(WITH_ZLIB) set(COMPRESS_SOURCES ${COMPRESS_SOURCES} @@ -26,7 +26,7 @@ sbml/compress/zfstream.h sbml/compress/zfstream.cpp sbml/compress/zipfstream.cpp -@@ -381,7 +373,7 @@ +@@ -380,7 +372,7 @@ endif() include_directories(${LIBZ_INCLUDE_DIR}) diff --git a/libsbml.spec b/libsbml.spec index 288e40d..b4574f1 100644 --- a/libsbml.spec +++ b/libsbml.spec @@ -33,14 +33,14 @@ %global _docdir_fmt %{name} Name: libsbml -Version: 5.16.0 -Release: 9%{?dist} +Version: 5.17.0 +Release: 1%{?dist} Summary: Systems Biology Markup Language library License: LGPLv2+ URL: http://sbml.org/Software/libSBML Source0: https://sourceforge.net/projects/sbml/files/libsbml/%{version}/stable/libSBML-%{version}-core-plus-packages-src.tar.gz -Source1: https://sourceforge.net/projects/sbml/files/libsbml/%{version}-experimental/source/beta-packages/render-%{version}-beta-1.zip +Source1: https://sourceforge.net/projects/sbml/files/libsbml/%{version}/stable/libSBML-%{version}-render-src.zip ## Unbundle minizip Patch0: libsbml-use-system-minizip-cmake.patch @@ -57,8 +57,6 @@ BuildRequires: minizip-devel BuildRequires: swig BuildRequires: hostname -Obsoletes: octave-SBML <= 0:5.14.0 - %description LibSBML is an open-source programming library designed to read, write, manipulate, translate, and validate SBML files and data @@ -379,12 +377,11 @@ popd %endif pushd build -#https://sourceforge.net/p/sbml/libsbml/452/ ctest --force-new-ctest-process -V \ %ifarch i686 - -E "test_csharp_bindings_full|test_ruby_binding|test_python" + -E "test_csharp_bindings_full|test_ruby_binding" %else - -E "test_ruby_binding|test_python" + -E "test_ruby_binding" %endif popd @@ -475,6 +472,9 @@ popd %endif %changelog +* Fri Jun 01 2018 Antonio Trande - 5.17.0-1 +- Update to 5.17.0 + * Fri May 18 2018 Tom Callaway - 5.16.0-9 - explicitly BR: javapackages-tools so that we have java macros diff --git a/sources b/sources index 915481a..a24f4b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libSBML-5.16.0-core-plus-packages-src.tar.gz) = 64133ef42ddd4e334ed3dca900cb5357660044548fbe9b9852677cd690145c0958300bbf65cffa9befde3eadf2ddf27353a8de9f0e1490ef4d3edae3f1705b85 -SHA512 (render-5.16.0-beta-1.zip) = c05382e6fcdb065798d7ee0e158b7581def2eb61d6666e87a0184bbe18d8cea89a23a503133cc0019f56d8a0647cedbc221c9481911cf6c5f0f214b05787b090 +SHA512 (libSBML-5.17.0-core-plus-packages-src.tar.gz) = 5246572bf8da10c42f28aef7db05593e45d53e67a8baf02cc6b6d6497093496e1dee4169e8cda491e9e6e454ca15cc3fb78cf4687946d4226a9e65ab902c995d +SHA512 (libSBML-5.17.0-render-src.zip) = 59d7f8c757901c7ea64ec11970619f7a43c7258fb62c756ef4df061a6db1d98009c3bc087864b28a30eaca9138005949b1abd43997029047c101e383a130f606