From 2575ff2531f35833b4347a0ea727fa7283aaff1a Mon Sep 17 00:00:00 2001 From: "Dmitrij S. Kryzhevich" Date: Wed, 9 Dec 2015 17:36:04 +0600 Subject: [PATCH] Fix bogus date, add foggoten patch to git --- mathgl-2.3.3-nooctaveinstall.patch | 24 ++++++++++++++++++++++++ mathgl.spec | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 mathgl-2.3.3-nooctaveinstall.patch diff --git a/mathgl-2.3.3-nooctaveinstall.patch b/mathgl-2.3.3-nooctaveinstall.patch new file mode 100644 index 0000000..6e9900b --- /dev/null +++ b/mathgl-2.3.3-nooctaveinstall.patch @@ -0,0 +1,24 @@ +--- lang/CMakeLists.txt 2015-11-24 12:36:50.203458528 +0600 ++++ lang/CMakeLists.txt.octave 2015-12-05 11:55:39.729209345 +0600 +@@ -125,12 +125,6 @@ message(STATUS "${oct_prog} ${oct_host} + ) + add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz) + +- install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH}) +- if(enable-octave-install) +- install(CODE "execute_process( +- COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\" +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") +- endif(enable-octave-install) + set(mgl_clean_files ${mgl_clean_files} mathgl) + endif(enable-octave) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}") +--- lang/DESCRIPTION 2015-11-24 12:36:50.203458528 +0600 ++++ lang/DESCRIPTION.newversion 2015-12-05 21:52:16.228784984 +0600 +@@ -1,5 +1,5 @@ + Name: mathgl +-Version: 2.0 ++Version: 2.3.3 + Date: 2011-08-23 + Author: Alexey Balakin + Maintainer: Dmitry Kulagin diff --git a/mathgl.spec b/mathgl.spec index 0d5fc53..02c5214 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -586,7 +586,7 @@ fi %endif %changelog -* Sat Dec 09 2015 Dsmitrij S. Kryzhevich - 2.3.3-5 +* Wed Dec 09 2015 Dsmitrij S. Kryzhevich - 2.3.3-5 - Reenable octave module. - Conditionalize doc and mpich subpackages. - Conditionalize libharu and octave: only for Fedora.