Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2016-02-25 22:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mathgl (Old) and /work/SRC/openSUSE:Factory/.mathgl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mathgl" Changes: -------- --- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes 2015-11-24 22:33:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2016-02-26 00:36:26.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 24 09:30:14 UTC 2016 - [email protected] + +- Update to version 2.3.4 + * Minor fixes and improvements, see included ChangeLog.txt for details + * Update mathgl-examples-install.patch + * Update mathgl-texmf-dir.patch + * Drop obsolete getopt.patch + * Drop obsolete mathgl-cmake-3.2.patch + +------------------------------------------------------------------- Old: ---- getopt.patch mathgl-2.3.3.tar.gz mathgl-cmake-3.2.patch New: ---- mathgl-2.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.S2pW8i/_old 2016-02-26 00:36:28.000000000 +0100 +++ /var/tmp/diff_new_pack.S2pW8i/_new 2016-02-26 00:36:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mathgl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ Name: mathgl %define libname libmgl -Version: 2.3.3 +Version: 2.3.4 Release: 0 # oct_version must be x.y.z %define oct_version %{version} -%define somajor 7.4.0 -%define libversion 7_4_0 +%define somajor 7.4.1 +%define libversion 7_4_1 Summary: Cross-platform library for making high-quality scientific graphics License: GPL-3.0 Group: Productivity/Scientific/Other @@ -41,12 +41,8 @@ Patch4: udav-help-path.patch # PATCH-FIX-OPENSUSE mathgl-texmf-dir.patch -- set correct path to texmf directory Patch5: mathgl-texmf-dir.patch -# PATCH-FIX-UPSTREAM mathgl-cmake-3.2.patch [email protected] -- Fix build with cmake 3.2 (x11 no longer implicit linked) -Patch6: mathgl-cmake-3.2.patch # PATCH-FIX-OPENSUSE mathgl-oldtexinfo.patch -- fix build with old texinfo -Patch7: mathgl-oldtexinfo.patch -# PATCH-FIX-UPSTREAM getopt.patch -- fix use of getopt -Patch8: getopt.patch +Patch6: mathgl-oldtexinfo.patch BuildRequires: cmake >= 2.8.12 BuildRequires: desktop-file-utils BuildRequires: fltk-devel @@ -418,11 +414,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %if 0%{?suse_version} <= 1320 -%patch7 -p1 +%patch6 -p1 %endif -%patch8 -p1 # Correct octave-mathgl version sed -i 's/2.0/%{oct_version}/' lang/DESCRIPTION ++++++ mathgl-2.3.3.tar.gz -> mathgl-2.3.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/mathgl/mathgl-2.3.3.tar.gz /work/SRC/openSUSE:Factory/.mathgl.new/mathgl-2.3.4.tar.gz differ: char 5, line 1 ++++++ mathgl-examples-install.patch ++++++ --- /var/tmp/diff_new_pack.S2pW8i/_old 2016-02-26 00:36:28.000000000 +0100 +++ /var/tmp/diff_new_pack.S2pW8i/_new 2016-02-26 00:36:28.000000000 +0100 @@ -1,7 +1,7 @@ -Index: mathgl-2.3.3/examples/CMakeLists.txt +Index: mathgl-2.3.4/examples/CMakeLists.txt =================================================================== ---- mathgl-2.3.3.orig/examples/CMakeLists.txt -+++ mathgl-2.3.3/examples/CMakeLists.txt +--- mathgl-2.3.4.orig/examples/CMakeLists.txt ++++ mathgl-2.3.4/examples/CMakeLists.txt @@ -4,22 +4,38 @@ endif(MGL_HAVE_GSL) add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) @@ -40,11 +40,11 @@ + ) endif(MGL_HAVE_WX) - if(enable-qt) -@@ -28,18 +44,34 @@ if(enable-qt) + if(QT_ENABLED) +@@ -27,17 +43,33 @@ if(QT_ENABLED) + if(enable-qt5) include(../cmake-qt5.txt) target_link_libraries(mgl_qt_example mgl-qt5) - qt5_wrap_cpp(qgl_moc_src qgl_example.h ) + install( + TARGETS mgl_qt_example + RUNTIME DESTINATION bin @@ -52,27 +52,26 @@ else(enable-qt5) include(../cmake-qt4.txt) target_link_libraries(mgl_qt_example mgl-qt4) - qt4_wrap_cpp(qgl_moc_src qgl_example.h ) + install( + TARGETS mgl_qt_example + RUNTIME DESTINATION bin + ) endif(enable-qt5) - add_executable(mgl_qgl_example wnd_samples.cpp qgl_example.cpp ${qgl_moc_src} ${MGL_MOC_EX_FILES}) + add_executable(mgl_qgl_example wnd_samples.cpp qgl_example.cpp) if(enable-qt5) target_link_libraries(mgl_qgl_example mgl) - qt5_use_modules(mgl_qgl_example Core Widgets Gui OpenGL) + qt5_use_modules(mgl_qgl_example ${MGL_QT5_LIBS}) + install( + TARGETS mgl_qgl_example + RUNTIME DESTINATION bin + ) else(enable-qt5) target_link_libraries(mgl_qgl_example mgl) - target_link_libraries(mgl_qgl_example ${QT_LIBRARIES}) + qt4_use_modules(mgl_qgl_example ${MGL_QT4_LIBS}) + install( + TARGETS mgl_qgl_example + RUNTIME DESTINATION bin + ) endif(enable-qt5) - endif(enable-qt) + endif(QT_ENABLED) ++++++ mathgl-texmf-dir.patch ++++++ --- /var/tmp/diff_new_pack.S2pW8i/_old 2016-02-26 00:36:28.000000000 +0100 +++ /var/tmp/diff_new_pack.S2pW8i/_new 2016-02-26 00:36:28.000000000 +0100 @@ -1,7 +1,7 @@ -Index: mathgl-2.3.3/mgltex/CMakeLists.txt +Index: mathgl-2.3.4/mgltex/CMakeLists.txt =================================================================== ---- mathgl-2.3.3.orig/mgltex/CMakeLists.txt -+++ mathgl-2.3.3/mgltex/CMakeLists.txt +--- mathgl-2.3.4.orig/mgltex/CMakeLists.txt ++++ mathgl-2.3.4/mgltex/CMakeLists.txt @@ -10,15 +10,6 @@ find_program(findmktexlsr mktexlsr) if(NOT findmktexlsr) message(SEND_ERROR "Couldn't find mktexlsr needed for LATEX example install.") @@ -18,13 +18,13 @@ # set(extramgl Axis_projection Vectorial) -@@ -39,6 +30,6 @@ get_directory_property(mglconv_clean ADD +@@ -49,6 +40,6 @@ get_directory_property(mglconv_clean ADD set(mglconv_clean ${mglconv_clean} scripts mgltex.sty sample.tex sample.aux sample.log) set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mglconv_clean}") --install(FILES mgltex.sty DESTINATION ${TEXMFLOCALDIR}/tex/latex/mgltex/) +-install(FILES ${MathGL_BINARY_DIR}/mgltex/mgltex.sty DESTINATION ${TEXMFLOCALDIR}/tex/latex/mgltex/) -install(FILES sample.tex mgltex.pdf ${MathGL_BINARY_DIR}/mgltex/sample.pdf DESTINATION ${TEXMFLOCALDIR}/doc/latex/mgltex/) -install(CODE "execute_process(COMMAND ${findmktexlsr} ${TEXMFLOCALDIR})") -+install(FILES mgltex.sty DESTINATION ${TEXMFDIR}/tex/latex/mgltex/) ++install(FILES ${MathGL_BINARY_DIR}/mgltex/mgltex.sty DESTINATION ${TEXMFDIR}/tex/latex/mgltex/) +install(FILES sample.tex mgltex.pdf ${MathGL_BINARY_DIR}/mgltex/sample.pdf DESTINATION ${TEXMFDIR}/doc/latex/mgltex/) +install(CODE "execute_process(COMMAND ${findmktexlsr} ${TEXMFDIR})")
