From 201eae9c495a59dc3ce955e6cd99744781a22be9 Mon Sep 17 00:00:00 2001 From: sagitter Date: Feb 03 2016 18:51:43 +0000 Subject: Update to commit #7b0f05 --- diff --git a/.gitignore b/.gitignore index b77e44a..b8e69d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /COPASI-3bc4e909636d7ec353b683819c5a6bbc209838aa.zip +/COPASI-7b0f05cea47a8cc712e78672c325096e3f6c5bd4.zip diff --git a/COPASI-fix_install_libpaths.patch b/COPASI-fix_install_libpaths.patch index c219915..8bbf5d5 100644 --- a/COPASI-fix_install_libpaths.patch +++ b/COPASI-fix_install_libpaths.patch @@ -1,7 +1,7 @@ ##This patch sets libraries' installation paths according to the Fedora packaging guidelines --- CMakeLists.orig.txt 2015-06-03 14:40:54.000000000 +0200 +++ CMakeLists.txt 2015-06-11 12:29:51.346501583 +0200 -@@ -696,7 +696,7 @@ +@@ -695,7 +695,7 @@ install(FILES "${PROJECT_SOURCE_DIR}/copasi/UI/icons/Copasi.ico" "${PROJECT_SOURCE_DIR}/copasi/UI/icons/CopasiDoc.ico" @@ -12,7 +12,7 @@ DESTINATION share/copasi/config) --- copasi/bindings/csharp/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/csharp/CMakeLists.txt 2015-01-07 16:29:49.830302408 +0100 -@@ -140,9 +140,7 @@ +@@ -146,9 +146,7 @@ target_link_libraries(binding_csharp_native_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} ) @@ -23,7 +23,7 @@ #################################################################### # -@@ -170,9 +168,9 @@ +@@ -176,9 +176,9 @@ add_custom_target(binding_csharp_managed_lib ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/copasicsP.dll) add_dependencies(binding_csharp_managed_lib binding_csharp_swig) @@ -37,7 +37,7 @@ # they still work with the current objectmodel --- copasi/bindings/perl/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/perl/CMakeLists.txt 2015-01-07 16:25:59.264689795 +0100 -@@ -137,7 +137,7 @@ +@@ -143,7 +143,7 @@ string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE "archname=" "" PERL_PLATFORM ${PERL_PLATFORM}) @@ -46,7 +46,7 @@ set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/COPASI) else() set(PERL_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/perl) -@@ -154,5 +154,5 @@ +@@ -160,5 +160,5 @@ set_target_properties(binding_perl_lib PROPERTIES SUFFIX ".bundle") endif() @@ -55,7 +55,7 @@ --- copasi/bindings/python/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/python/CMakeLists.txt 2015-01-07 19:32:33.235855748 +0100 -@@ -128,10 +128,10 @@ +@@ -134,10 +134,10 @@ set(PYTHON_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/python) endif() @@ -70,7 +70,7 @@ +INSTALL(FILES ${examples} DESTINATION ${PYTHON_PACKAGE_INSTALL_DIR}/copasi/examples) --- copasi/bindings/java/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/java/CMakeLists.txt 2015-01-07 21:08:43.571075012 +0100 -@@ -132,7 +132,7 @@ +@@ -146,7 +146,7 @@ set_target_properties (binding_java_lib PROPERTIES SUFFIX ".jnilib") endif() @@ -79,7 +79,7 @@ target_link_libraries(binding_java_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} ) -@@ -164,9 +168,9 @@ +@@ -178,9 +178,9 @@ install(FILES ${COPASI_JAR} ${COPASI_GUI_JAR} @@ -93,12 +93,12 @@ # they still work with the current objectmodel --- copasi/bindings/octave/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/octave/CMakeLists.txt 2015-01-08 18:34:10.609971192 +0100 -@@ -126,11 +126,11 @@ +@@ -133,11 +133,11 @@ # set(OCTAVE_PACKAGE_INSTALL_DIR) if (UNIX OR CYGWIN) - set(OCTAVE_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) -+ set(OCTAVE_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/octave/packages/COPASI-${COPASI_OVERRIDE_VERSION}) ++ set(OCTAVE_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/octave/packages/COPASI-4.17) else() set(OCTAVE_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/octave) endif() diff --git a/COPASI.spec b/COPASI.spec index 8cbd9aa..f762b34 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -1,10 +1,5 @@ -##Disabled debug package for unknown error -#/usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character -%global _enable_debug_packages %{nil} -%global debug_package %{nil} - -%global checkout 3bc4e909636d7ec353b683819c5a6bbc209838aa -%global date 20150817 +%global checkout 7b0f05cea47a8cc712e78672c325096e3f6c5bd4 +%global date 20160203 %global with_python2 1 %global with_python3 1 @@ -15,9 +10,7 @@ %global with_java 1 %endif -##Octave 4.0 not supported -##http://www.copasi.org/tracker/show_bug.cgi?id=2176 -%global with_octave 0 +%global with_octave 1 %global with_perl 1 %global with_r 1 @@ -41,8 +34,8 @@ Name: COPASI Summary: Biochemical network simulator -Version: 4.16 -Release: 0.22.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Version: 4.17 +Release: 0.1.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -384,6 +377,11 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/R/library/%{octpkg}/libs/COPASI.so %endif ## +%if 0%{?with_octave} +mkdir -p $RPM_BUILD_ROOT%{octpkgdir}/packinfo +install -pm 644 copasi/ArtisticLicense.txt $RPM_BUILD_ROOT%{octpkgdir}/packinfo +%endif + ##Install .xpm icon files install -pm 644 copasi/UI/icons/Copasi48-Alpha.xpm $RPM_BUILD_ROOT%{_datadir}/icons/copasi/icons @@ -502,7 +500,8 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda %if 0%{?with_octave} %files -n octave-%{octpkg} -%license copasi/ArtisticLicense.txt +%dir %{octpkgdir} +%{octpkgdir}/packinfo/ArtisticLicense.txt %{octpkglibdir}/ %endif @@ -529,6 +528,12 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda %{_datadir}/copasi/doc/ %changelog +* Wed Feb 03 2016 Antonio Trande 4.17-0.1.20160203git7b0f05 +- Rebuild with GCC-6.0 +- Update to commit #7b0f05 +- License for octave sub-package relocated +- Debugging re-enabled + * Wed Feb 03 2016 Fedora Release Engineering - 4.16-0.22.20150817git3bc4e9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 33b2a37..2de51bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97f8ef72381977a33282ceda0b73d5d2 COPASI-3bc4e909636d7ec353b683819c5a6bbc209838aa.zip +6169caff5b738b7831b2580c7cc6f0be COPASI-7b0f05cea47a8cc712e78672c325096e3f6c5bd4.zip