Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2015-02-10 20:21:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-01 12:30:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2015-02-10 20:21:12.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Feb 2 19:15:03 UTC 2015 - [email protected] + +- Update to version 2.3.2 + * Update mgltex. + * Add reading files with complex numbers by 'read' command. + * Parallelize reading textual data files. + * Add 'i','j','k' variables for data filling. + * Add saving images in QMathGL even if corresponding format + support is disabled. + * Add cmake option MGL_DEF_FONT to change default font name + or use built-in one (if MGL_DEF_FONT is empty). + * Compatibility changes and bugfixes. + * Update mathgl-fix-python-module-path.patch +- Add mathgl-tex subpackage +- Set correct path to texmf directory + * mathgl-texmf-dir.patch +- Fix package descriptions + +------------------------------------------------------------------- @@ -5 +24,23 @@ - * See included ChangeLog.txt file for details + * Add MGL command 'load' for loading MGL commands from external + .so module. + * Add Logo() function to draw bitmap (logo), which is stretched + along whole axis range + * Add MGL command 'reset' which restore default settings and + clear image (i.e. call DefaultPlotParam()). + * Change y coordinate at x-z projection. + * Improve projection of 'unrotatable' objects (like legend, title, ...). + * Add projection (Ternary&8) which is the same as usual (Ternary&4) + but don't print text on projections + * Improve orientation of axis ticks and labels. + * Add mglWnd::SetDrawFunc(). + * Add mgl_set_global_warn() and mgl_get_global_warn() for set/get + messages of global scope. + * Make copying private of mglGraph and derived. + * Add virtual destructors. + * Add some static functions for mglGraph. + * Add option "-n" to mglconv to disable automatic saving of the image. + * Add option "-s" to mglview and mglconv to run setup script before + the main one. + * Add light scaling at MGLD import. + * Add scaling of frames at Adjust(). + * Update docs. Old: ---- mathgl-2.3.1.tar.gz New: ---- mathgl-2.3.2.tar.gz mathgl-texmf-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.FZHqnt/_old 2015-02-10 20:21:13.000000000 +0100 +++ /var/tmp/diff_new_pack.FZHqnt/_new 2015-02-10 20:21:13.000000000 +0100 @@ -20,10 +20,10 @@ Name: mathgl %define libname libmgl -Version: 2.3.1 +Version: 2.3.2 Release: 0 # oct_version must be x.y.z -%define oct_version 2.3.1 +%define oct_version %{version} %define somajor 7.4.0 %define libversion 7_4_0 Summary: Cross-platform library for making high-quality scientific graphics @@ -39,7 +39,9 @@ Patch3: mathgl-doc-path.patch # PATCH-FIX-OPENSUSE udav-help-path.patch -- fix path to documentation directory Patch4: udav-help-path.patch -BuildRequires: cmake +# PATCH-FIX-OPENSUSE mathgl-texmf-dir.patch -- set correct path to texmf directory +Patch5: mathgl-texmf-dir.patch +BuildRequires: cmake >= 2.8.12 BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ @@ -65,6 +67,7 @@ BuildRequires: python-numpy-devel BuildRequires: swig BuildRequires: texinfo +BuildRequires: texlive-filesystem BuildRequires: texlive-latex %if 0%{?suse_version} >= 1320 BuildRequires: wxWidgets-devel >= 3 @@ -85,99 +88,99 @@ %endif %description -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package -n %{libname}%{libversion} -Summary: Mathgl is a cross-platform library for making high-quality scientific graphics +Summary: MathGL is a cross-platform library for making high-quality scientific graphics Group: System/Libraries Requires: %{name}-fonts >= %{version} %description -n %{libname}%{libversion} -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package -n %{libname}-fltk%{libversion} -Summary: Mathgl FLTK widget library for making high-quality scientific graphics +Summary: MathGL FLTK widget library for making high-quality scientific graphics Group: System/Libraries %description -n %{libname}-fltk%{libversion} -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package -n %{libname}-glut%{libversion} -Summary: Mathgl window library for making high-quality scientific graphics +Summary: MathGL window library for making high-quality scientific graphics Group: System/Libraries %description -n %{libname}-glut%{libversion} -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package -n %{libname}-qt4-%{libversion} -Summary: Mathgl Qt4 widget library for making high-quality scientific graphics +Summary: MathGL Qt4 widget library for making high-quality scientific graphics Group: System/Libraries %description -n %{libname}-qt4-%{libversion} -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package -n %{libname}-qt5-%{libversion} -Summary: Mathgl Qt5 widget library for making high-quality scientific graphics +Summary: MathGL Qt5 widget library for making high-quality scientific graphics Group: System/Libraries %description -n %{libname}-qt5-%{libversion} -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package -n %{libname}-wnd%{libversion} -Summary: Mathgl window library for making high-quality scientific graphics +Summary: MathGL window library for making high-quality scientific graphics Group: System/Libraries %description -n %{libname}-wnd%{libversion} -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package -n %{libname}-wx%{libversion} -Summary: Mathgl wxWidget library for making high-quality scientific graphics +Summary: MathGL wxWidget library for making high-quality scientific graphics Group: System/Libraries %description -n %{libname}-wx%{libversion} -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. %package cgi -Summary: Mathgl CGI binary +Summary: MathGL CGI binary Group: Productivity/Scientific/Other %description cgi -This package contains mathgl binary for parsing CGI scripts. +This package contains mathGL binary for parsing CGI scripts. %package devel -Summary: Libraries and header files for %{name} library +Summary: Libraries and header files for MathGL library Group: Development/Libraries/Other Requires: %{libname}%{libversion} = %{version} Requires: %{libname}-fltk%{libversion} = %{version} @@ -193,137 +196,174 @@ %endif %description devel -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. This package contains libraries and header files for developing -applications that use mathgl. +applications that use MathGL. %package devel-static -Summary: Static libraries for %{name} library +Summary: Static libraries for MathGL library Group: Development/Libraries/Other Requires: mathgl-devel = %{version} %description devel-static -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. This package contains static libraries for developing applications -that use mathgl. +that use MathGL. %package doc -Summary: Documentation for %{name} +Summary: Documentation for MathGL Group: Documentation/HTML BuildArch: noarch %description doc -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. -This package provides the documentation for mathgl in HTML format. +This package provides the documentation for MathGL in HTML format. %package doc-pdf -Summary: Documentation for %{name} +Summary: Documentation for MathGL Group: Documentation/Other BuildArch: noarch %description doc-pdf -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. -This package provides the documentation for mathgl in PDF format. +This package provides the documentation for MathGL in PDF format. %package doc-ru -Summary: Russian documentation for %{name} +Summary: Russian documentation for MathGL Group: Documentation/Other +Provides: locale(mathgl-doc:ru) Requires: mathgl-doc = %{version} BuildArch: noarch %description doc-ru -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. -This package provides Russian documentation for mathgl. +This package provides Russian documentation for MathGL. %package examples Summary: Examples for %{name} library Group: Productivity/Scientific/Other %description examples -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. -This package contains examples of using mathgl. +This package contains examples of using MathGL. %package fonts -Summary: Fonts for %{name} library +Summary: Fonts for MathGL library Group: System/X11/Fonts BuildArch: noarch %description fonts -This package contains command fonts for mathgl library. +This package contains command fonts for MathGL library. %package lua -Summary: Lua interface for %{name} library +Summary: Lua interface for MathGL library Group: Productivity/Scientific/Other %description lua -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. -This package provides lua interface for mathgl. +This package provides lua interface for MathGL. %package -n octave-mathgl -Summary: Octave interface for %{name} library +Summary: Octave interface for MathGL library Group: Productivity/Scientific/Other Requires: octave %description -n octave-mathgl -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. -This package provides Octave interface for mathgl. +This package provides Octave interface for MathGL. %package -n python-mathgl -Summary: Libraries and header files for %{name} library +Summary: Libraries and header files for MathGL library Group: Productivity/Scientific/Other Requires: python-base %description -n python-mathgl -Mathgl is a cross-platform library for making high-quality scientific +MathGL is a cross-platform library for making high-quality scientific graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding -into other programs. Mathgl integrates into fltk, qt and -opengl applications. +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. -This package provides the python bindings for mathgl. +This package provides the python bindings for MathGL. + +%package tex +Summary: MathGL scripts in LaTeX document +Group: Productivity/Publishing/TeX/Base +Provides: tex(mgltex.sty) +Requires: mathgl-tools >= %{version} +Recommends: mathgl-tex-doc = %{version} +BuildArch: noarch +Requires(pre): texlive +Requires(post): coreutils +Requires(postun): coreutils +Requires(postun): texlive +Requires(posttrans): texlive + +%description tex +MathGL is a cross-platform library for making high-quality scientific +graphics. It provides fast data plotting and handling of large data +arrays, as well as window and console modes and for easy embedding +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. + +This package allows to use MathGL scripts in LaTeX documents. + +%package tex-doc +Summary: Documentation for mglTeX +Group: Productivity/Publishing/TeX/Base +BuildArch: noarch + +%description tex-doc +MathGL is a cross-platform library for making high-quality scientific +graphics. It provides fast data plotting and handling of large data +arrays, as well as window and console modes and for easy embedding +into other programs. MathGL integrates into FLTK, Qt and +OpenGL applications. + +This package provides documentation for mglTeX. %package tools -Summary: Command line tools for %{name} library +Summary: Command line tools for MathGL library Group: Productivity/Scientific/Other %description tools @@ -346,6 +386,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Correct octave-mathgl version sed -i 's/2.0/%{oct_version}/' lang/DESCRIPTION @@ -361,6 +402,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DMGL_LIB_INSTALL_DIR:PATH=%{_lib} \ + -DTEXMFDIR:PATH=%{_datadir}/texmf/ \ -Denable-double=on \ -Denable-mpi=off \ -Denable-pthread=off \ @@ -385,6 +427,7 @@ -Denable-lua=on \ -Denable-octave=on \ -Denable-octave-install=off \ + -Denable-mgltex=on \ -Denable-doc-html=on \ -Denable-doc-pdf-en=on \ -Denable-texi2html=on \ @@ -416,6 +459,11 @@ rm %{buildroot}%{_libdir}/libmgl-qt.so.%{somajor} ln -s libmgl-qt4.so.%{somajor} %{buildroot}%{_libdir}/libmgl-qt.so.%{somajor} +# LaTeX package (based on TeXLive spec files) +mkdir -p %{buildroot}/var/adm/update-scripts +ln -sf %{_datadir}/texmf/texconfig/zypper.py \ + %{buildroot}/var/adm/update-scripts/texlive-mgltex-%{version}-%{release}-zypper + # %%post doc # %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info.gz # %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info-1.gz @@ -462,6 +510,26 @@ %postun -n octave-mathgl octave -qf %{octave_args} --eval "pkg rebuild" +%post tex +mkdir -p /var/run/texlive +> /var/run/texlive/run-mktexlsr +> /var/run/texlive/run-update + +%postun tex +if test $1 = 0; then + %{_bindir}/mktexlsr 2> /dev/null || : + exit 0 +fi +mkdir -p /var/run/texlive +> /var/run/texlive/run-mktexlsr +> /var/run/texlive/run-update + +%posttrans tex +test -f /var/run/texlive/run-update || exit 0 +test -z "$ZYPP_IS_RUNNING" || exit 0 +VERBOSE=false %{_datadir}/texmf/texconfig/update || : +rm -f /var/run/texlive/run-update + %files -n %{libname}%{libversion} %defattr(-,root,root) %{_libdir}/libmgl.so.%{somajor}* @@ -554,6 +622,15 @@ %defattr(-,root,root) %{python_sitearch}/* +%files tex +%defattr(-,root,root) +%{_datadir}/texmf/tex/latex/mgltex/ +/var/adm/update-scripts/texlive-mgltex-%{version}-%{release}-zypper + +%files tex-doc +%defattr(-,root,root) +%{_datadir}/texmf/doc/latex/mgltex/ + %files tools %defattr(-,root,root) %{_bindir}/mglconv ++++++ mathgl-2.3.1.tar.gz -> mathgl-2.3.2.tar.gz ++++++ ++++ 5852 lines of diff (skipped) ++++++ mathgl-fix-python-module-path.patch ++++++ --- /var/tmp/diff_new_pack.FZHqnt/_old 2015-02-10 20:21:14.000000000 +0100 +++ /var/tmp/diff_new_pack.FZHqnt/_new 2015-02-10 20:21:14.000000000 +0100 @@ -1,10 +1,10 @@ -Index: mathgl-2.3/lang/CMakeLists.txt +Index: mathgl-2.3.2/lang/CMakeLists.txt =================================================================== ---- mathgl-2.3.orig/lang/CMakeLists.txt -+++ mathgl-2.3/lang/CMakeLists.txt -@@ -36,7 +36,7 @@ if(enable-python) +--- mathgl-2.3.2.orig/lang/CMakeLists.txt ++++ mathgl-2.3.2/lang/CMakeLists.txt +@@ -39,7 +39,7 @@ if(enable-python) - include_directories(${PYTHON_INCLUDE_DIR}) + include_directories(${PYTHON_INCLUDE_DIR} ${NUMPY_INCLUDE_PATH}) execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}')" + COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(get_python_lib(1),prefix='${CMAKE_INSTALL_PREFIX}')" ++++++ mathgl-texmf-dir.patch ++++++ Index: mathgl-2.3.2/mgltex/CMakeLists.txt =================================================================== --- mathgl-2.3.2.orig/mgltex/CMakeLists.txt +++ mathgl-2.3.2/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.") endif(NOT findmktexlsr) -execute_process( - COMMAND ${findkpsewhich} -var-value=TEXMFLOCAL - OUTPUT_VARIABLE TEXMFLOCALDIR - RESULT_VARIABLE TEXMFLOCAL_ERR - OUTPUT_STRIP_TRAILING_WHITESPACE -) -if(NOT TEXMFLOCALDIR) - message(SEND_ERROR "Couldn't find TEXMFLOCAL directory.") -endif(NOT TEXMFLOCALDIR) set(extramgl Axis_projection Vectorial) @@ -51,6 +42,6 @@ get_directory_property(mglconv_clean ADD set(mglconv_clean ${mglconv_clean} scripts sample.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 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 sample.tex mgltex.pdf ${MathGL_BINARY_DIR}/mgltex/sample.pdf DESTINATION ${TEXMFDIR}/doc/latex/mgltex/) +install(CODE "execute_process(COMMAND ${findmktexlsr} ${TEXMFDIR})") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
