From 23bf7489e151b5872ba35cc76cc09c4b38298f7b Mon Sep 17 00:00:00 2001 From: Dmitrij S. Kryzhevich Date: Jan 09 2017 10:31:28 +0000 Subject: Update to new 2.3.5.1 --- diff --git a/.gitignore b/.gitignore index b1609df..2855fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ mathgl-1.10.2.1.tgz /mathgl-2.3.tar.gz /mathgl-2.3.3.tar.gz /mathgl-2.3.4.tar.gz +/mathgl-2.3.5.1.tar.gz diff --git a/mathgl-2.3.3-fltk-skip-fluid.patch b/mathgl-2.3.3-fltk-skip-fluid.patch deleted file mode 100644 index 5097e92..0000000 --- a/mathgl-2.3.3-fltk-skip-fluid.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt 2015-11-24 12:29:02.177681649 +0600 -+++ CMakeLists.txt 2015-11-24 12:30:50.909910702 +0600 -@@ -406,6 +406,7 @@ endif(enable-glut) - - if(enable-fltk) - set(MGL_HAVE_FLTK 1) -+ set(FLTK_SKIP_FLUID 1) - include(FindFLTK) - if(NOT FLTK_FOUND) - message(SEND_ERROR "Couldn't find FLTK library.") diff --git a/mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch b/mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch deleted file mode 100644 index c77850c..0000000 --- a/mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt 2015-11-24 12:15:35.787678739 +0600 -+++ CMakeLists.txt 2015-11-24 12:20:24.562634222 +0600 -@@ -292,7 +292,7 @@ else(enable-all OR enable-ltdl) - set(MGL_HAVE_LTDL 0) - endif(enable-all OR enable-ltdl) - --if(enable-hdf4) -+if(enable-hdf4 AND (NOT enable-hdf5)) - set(MGL_HAVE_HDF4 1) - find_library(HDF4_LIB df) - find_library(HDF4MF_LIB mfhdf) -@@ -303,9 +303,9 @@ if(enable-hdf4) - message(SEND_ERROR "${HDF4_INCLUDE_DIR}") - message(SEND_ERROR "Couldn't find HDF4 libraries.") - endif(NOT HDF4_LIB OR NOT HDF4MF_LIB OR NOT HDF4_INCLUDE_DIR) --else(enable-hdf4) -+else(enable-hdf4 AND (NOT enable-hdf5)) - set(MGL_HAVE_HDF4 0) --endif(enable-hdf4) -+endif(enable-hdf4 AND (NOT enable-hdf5)) - - if(enable-hdf5) - set(MGL_HAVE_HDF5 1) diff --git a/mathgl-2.3.3-no_octave.patch b/mathgl-2.3.3-no_octave.patch deleted file mode 100644 index c472b0b..0000000 --- a/mathgl-2.3.3-no_octave.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt 2015-11-24 12:23:06.821006701 +0600 -+++ CMakeLists.txt 2015-11-24 12:29:02.177681649 +0600 -@@ -121,6 +121,8 @@ MGL_DEPENDENT_OPTION(enable-python "Enab - MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -+SET( enable-octave OFF ) -+SET( enable-octave-install OFF ) - - include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) - set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2") diff --git a/mathgl-2.3.3-no_qt4.patch b/mathgl-2.3.3-no_qt4.patch deleted file mode 100644 index fd221d1..0000000 --- a/mathgl-2.3.3-no_qt4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- CMakeLists.txt 2015-11-24 12:30:50.909910702 +0600 -+++ CMakeLists.txt 2015-11-24 12:33:38.836090820 +0600 -@@ -102,7 +102,8 @@ CMAKE_DEPENDENT_OPTION(enable-gif "Enabl - CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) -+#CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) -+set(enable-qt4 OFF) - CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) - diff --git a/mathgl-2.3.3-nooctaveinstall.patch b/mathgl-2.3.3-nooctaveinstall.patch deleted file mode 100644 index 6e9900b..0000000 --- a/mathgl-2.3.3-nooctaveinstall.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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-2.3.3-signed_char.patch b/mathgl-2.3.3-signed_char.patch deleted file mode 100644 index 30d98e0..0000000 --- a/mathgl-2.3.3-signed_char.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urp mathgl-2.3.3/examples/full_test.cpp mathgl-2.3.3-signed_char/examples/full_test.cpp ---- mathgl-2.3.3/examples/full_test.cpp 2015-11-24 12:36:50.209458320 +0600 -+++ mathgl-2.3.3-signed_char/examples/full_test.cpp 2015-11-26 11:45:03.816885186 +0600 -@@ -392,7 +392,7 @@ int main(int argc,char **argv) - mgl_suppress_warn(true); - const char *suf = ""; - char name[256]="", *tmp; -- int ch; -+ signed int ch; - time_t st,en; time(&st); - mglGraph *gr = NULL; - mglSample *s=samp; -diff -urp mathgl-2.3.3/utils/make_bin.cpp mathgl-2.3.3-signed_char/utils/make_bin.cpp ---- mathgl-2.3.3/utils/make_bin.cpp 2015-11-24 12:36:50.209458320 +0600 -+++ mathgl-2.3.3-signed_char/utils/make_bin.cpp 2015-11-26 11:44:23.629270158 +0600 -@@ -24,7 +24,7 @@ int main(int argc, char *argv[]) - { - mglFont fnt; - std::string path, base, fname; -- char ch; -+ signed char ch; - - while(1) - { -diff -urp mathgl-2.3.3/utils/mglconv.cpp mathgl-2.3.3-signed_char/utils/mglconv.cpp ---- mathgl-2.3.3/utils/mglconv.cpp 2015-11-24 12:36:50.209458320 +0600 -+++ mathgl-2.3.3-signed_char/utils/mglconv.cpp 2015-11-26 11:47:02.414797998 +0600 -@@ -28,7 +28,8 @@ int main(int argc, char *argv[]) - mgl_suppress_warn(true); - mglGraph gr; - mglParse p(true); -- char ch, buf[2048], iname[256]="", oname[256]=""; -+ signed char ch; -+ char buf[2048], iname[256]="", oname[256]=""; - std::vector var; - std::wstring str; - bool none=false; -diff -urp mathgl-2.3.3/utils/mglview.cpp mathgl-2.3.3-signed_char/utils/mglview.cpp ---- mathgl-2.3.3/utils/mglview.cpp 2015-11-24 12:36:50.209458320 +0600 -+++ mathgl-2.3.3-signed_char/utils/mglview.cpp 2015-11-26 11:46:16.959364509 +0600 -@@ -39,7 +39,8 @@ int show(mglGraph *gr) - //----------------------------------------------------------------------------- - int main(int argc, char **argv) - { -- char ch, iname[256]=""; -+ signed char ch; -+ char iname[256]=""; - mgl_suppress_warn(true); - while(1) - { diff --git a/mathgl-2.3.4-examples.patch b/mathgl-2.3.4-examples.patch deleted file mode 100644 index 42046f5..0000000 --- a/mathgl-2.3.4-examples.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urp mathgl-2.3.4/examples/CMakeLists.txt mathgl-2.3.4-examples/examples/CMakeLists.txt ---- mathgl-2.3.4/examples/CMakeLists.txt 2016-02-14 01:03:50.000000000 +0600 -+++ mathgl-2.3.4-examples/examples/CMakeLists.txt 2016-02-16 10:32:34.276636812 +0600 -@@ -1,6 +1,7 @@ - if(MGL_HAVE_GSL) - include_directories(${GSL_INCLUDE_DIR}) - endif(MGL_HAVE_GSL) -+SET(MGL_INSTALL_EXAMPLES_LIST mgl_example) - - add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) - target_link_libraries(mgl_example mgl) -@@ -9,17 +10,20 @@ if(MGL_HAVE_FLTK) - include_directories(${FLTK_INCLUDE_DIR}) - add_executable(mgl_fltk_example wnd_samples.cpp fltk_example.cpp) - target_link_libraries(mgl_fltk_example mgl-fltk) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_fltk_example) - endif(MGL_HAVE_FLTK) - - if(MGL_HAVE_GLUT) - add_executable(mgl_glut_example wnd_samples.cpp glut_example.cpp) - target_link_libraries(mgl_glut_example mgl-glut) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_glut_example) - endif(MGL_HAVE_GLUT) - - if(MGL_HAVE_WX) - include(${wxWidgets_USE_FILE}) - add_executable(mgl_wx_example wnd_samples.cpp wx_example.cpp) - target_link_libraries(mgl_wx_example mgl-wx) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_wx_example) - endif(MGL_HAVE_WX) - - if(QT_ENABLED) -@@ -39,6 +43,7 @@ if(QT_ENABLED) - target_link_libraries(mgl_qgl_example mgl) - qt4_use_modules(mgl_qgl_example ${MGL_QT4_LIBS}) - endif(enable-qt5) -+ SET(MGL_INSTALL_EXAMPLES_LIST ${MGL_INSTALL_EXAMPLES_LIST} mgl_qt_example mgl_qgl_example) - - endif(QT_ENABLED) - -@@ -48,3 +53,7 @@ if(MGL_HAVE_LTDL) - target_link_libraries(mgl_module mgl) # for compatibility with win32 - endif(MGL_HAVE_LTDL) - -+install( -+ TARGETS ${MGL_INSTALL_EXAMPLES_LIST} -+ RUNTIME DESTINATION bin -+) diff --git a/mathgl-2.3.4-x11.patch b/mathgl-2.3.4-x11.patch deleted file mode 100644 index 6675d65..0000000 --- a/mathgl-2.3.4-x11.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- udav/CMakeLists.txt 2016-02-15 16:59:57.763709611 +0600 -+++ udav/CMakeLists.txt 2016-02-16 10:57:58.345497232 +0600 -@@ -38,10 +38,10 @@ endif(enable-qt5) - add_executable(udav ${udav_src} ${udav_moc_hdr} ${udav_rc_src}) - #set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -pthread") - if(enable-qt5) -- target_link_libraries(udav mgl-qt5) -+ target_link_libraries(udav mgl-qt5 X11) - qt5_use_modules(udav ${MGL_QT5_LIBS}) - else(enable-qt5) -- target_link_libraries(udav mgl-qt4) -+ target_link_libraries(udav mgl-qt4 X11) - qt4_use_modules(udav ${MGL_QT4_LIBS}) - endif(enable-qt5) - diff --git a/mathgl.spec b/mathgl.spec index df75cce..10ab386 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -20,36 +20,35 @@ Name: mathgl -Version: 2.3.4 -Release: 7%{?dist} +Version: 2.3.5 +# .1 from Version go to Release as octave fails with 4 digits in ver string +Release: 1%{?dist}.1 Summary: Cross-platform library for making high-quality scientific graphics Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken Summary(ru): Библиотека для осуществления высококачественной визуализации данных License: GPLv2+ Group: Development/Libraries Url: http://mathgl.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz - -#Mathgl's enable all tries to use hdf4 and 5 at the same time -Patch0: mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch +# Add .1 to version +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.1.tar.gz # Install binaries for generation examples of illustrations -Patch1: mathgl-2.3.4-examples.patch - -# There is no easy way to disable ONLY octave. Have to cut it from CmakeList.txt -Patch2: mathgl-2.3.3-no_octave.patch +Patch0: mathgl-2.3.5.1-examples.patch # Skip FLUID binary test -Patch3: mathgl-2.3.3-fltk-skip-fluid.patch +Patch1: mathgl-2.3.5.1-fltk-skip-fluid.patch # No qt4 and qt5 simultaneously. -Patch4: mathgl-2.3.3-no_qt4.patch +Patch2: mathgl-2.3.5.1-no_qt4.patch -# Fix linking with libX11 -Patch5: mathgl-2.3.4-x11.patch +# Mathgl's enable all tries to use hdf4 and 5 at the same time +Patch3: mathgl-2.3.5.1-no_hdf4-and-hdf5-simultaneously.patch # Let macros to decide how to install octave module -Patch6: mathgl-2.3.3-nooctaveinstall.patch +Patch4: mathgl-2.3.5.1-nooctaveinstall.patch + +# There is no easy way to disable ONLY octave. Have to cut it from CmakeList.txt +Patch5: mathgl-2.3.5.1-nooctave.patch Requires: %{name}-common = %{version}-%{release} @@ -289,7 +288,8 @@ Requires: wxGTK-devel %{summary}. %prep -%setup -q +# .1 go here too +%setup -qn %{name}-%{version}.1 #convert EOL encodings, maintaining timestames @@ -299,26 +299,24 @@ for file in AUTHORS ChangeLog.txt README ; do mv $file.new $file done -%patch0 -b .no-hdf4-and-hdf5-simultaneously -%patch1 -p1 -b .examples +%patch0 -p1 -b .examples +%patch1 -p1 -b .fluid +%patch2 -p1 -b .no_qt4 +%patch3 -p1 -b .no-hdf4-and-hdf5-simultaneously %if 0%{?with_octave} -%patch6 -b .nooctaveinstall +%patch4 -p1 -b .nooctaveinstall %else -%patch2 -b .no_octave +%patch5 -p1 -b .no_octave %endif -%patch3 -b .fluid -%patch4 -b .no_qt4 -%patch5 -b .x11 + # Fix hardcoded paths sed -i s,/usr/local/share/doc/mathgl/,%{_docdir}/%{name}/, udav/udav_wnd.h sed -i s,/usr/local/share/udav/,%{_datadir}/udav/, udav/udav_wnd.cpp sed -i s,/usr/local/share/mathgl/fonts/,%{_datadir}/%{name}/fonts/, udav/prop_dlg.cpp -%if 0%{?with_octave} -# Fix octave module version +# Fix octave module version wether we need it or not sed -i -e "s,Version:.*,Version: %{version}," lang/DESCRIPTION -%endif %build @@ -348,9 +346,7 @@ pushd %{_target_platform}_$MPI_COMPILER_NAME; \ $BUILD_MPI \\\ ..; \ popd; \ -make -C %{_target_platform}_$MPI_COMPILER_NAME -#make %{?_smp_mflags} -C %{_target_platform}_$MPI_COMPILER_NAME -# disable SMP build for testing +make %{?_smp_mflags} -C %{_target_platform}_$MPI_COMPILER_NAME # serial MPI_COMPILER_NAME=serial %building_serial @@ -586,8 +582,13 @@ fi %endif %changelog +* Mon Jan 09 2017 Dmitrij S. Kryzhevich - 2.3.5.1-1 +- Update to new version. +- Update patches for new version. +- Drop X11 patch. + * Fri Jan 06 2017 Dmitrij S. Kryzhevich - 2.3.4-7 -- Disable octave support for as octave-4.2 is not supported by swig for now. +- Disable octave support for rawhide as octave-4.2 is not supported by swig for now. * Thu Dec 08 2016 Dmitrij S. Kryzhevich - 2.3.4-6 - Fix description tag for octave-mathgl. diff --git a/sources b/sources index 5cf7316..b225dc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64c804690e82570cc05b89df9e7c39d4 mathgl-2.3.4.tar.gz +SHA512 (mathgl-2.3.5.1.tar.gz) = 6af17b2fb2e6652028063839b14677a4256f20e568a854f9cc5ce79819838a425124193c5f580f96d5b3e9dc81ca0c7ab7076b0b8cfc17c0a7676f3d4c7ed6a3