Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2014-08-18 11:23:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-21 15:22:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2014-08-18 11:23:54.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Aug 7 14:54:49 UTC 2014 - dmitr...@opensuse.org + +- Update to version 2.3 + * Add background image, which allow in particular semi-transparent + background color. + * Add primitives to draw polygon and angle arc. + * Allow arbitrary factor for axis ticks. + * Add function AddTick() for adding manual tick to existed ones. + * Add new styles and symbols. + * Add ODE solving functions for textual formulas. + * Add function for global cubic spline interpolation, and function + to refill using global spline. + * Add functions "random(dat)" and "gamma_inc(a,x)" to the list + of known functions for formula parsing + * Add 'inf' variable to the MGL and formula parsing + * Allow reading JPEG files for mglData::Import(). + * Warning messages and information are printed to stderr until + call of mgl_suppress_warn(true) will disable it. + * Add move constructor(s) if compiler support C++11 rvalues. + * Changes in algorithms: + - Greatly increase speed of formula parsing, and speeding up + many other places; + - Improve algorithm for contours drawing and filling, taking + special attention to quasi-random data. + - Spline() now use 5-th order polynomials to keep continuity + of 2nd derivative too. + - Add function attributes 'pure' or 'const', which potentially + can speed up drawing. + - Use spline instead of linear interpolation in functions + Flow() and Pipe(). + - Adjust columnplot and gridplot positions for non-zero + distance between the inplots. + - Improve colorbar labels drawing at SetRotatedText(false) + - Choose new scales for perspective. + - Allow 'negative' angles for text rotation + - Use new s-hull version for triangulation. + * UDAV improvements. + * Remove obsolete mathgl-fltk.patch +- Enable OpenMP support +- Move PDF documentation to separate package. +- Disable info files build due to outdated texinfo + +------------------------------------------------------------------- Old: ---- mathgl-2.2.2.1.tar.gz mathgl-fltk.patch New: ---- mathgl-2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.FyPDSH/_old 2014-08-18 11:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.FyPDSH/_new 2014-08-18 11:23:55.000000000 +0200 @@ -22,26 +22,25 @@ Name: mathgl %define libname libmgl -Version: 2.2.2.1 +Version: 2.3 Release: 0 -%define oct_version 2.2.2 -%define somajor 7.2.0 -%define libversion 7_2_0 +# oct_version must be x.y.z +%define oct_version 2.3.0 +%define somajor 7.3.0 +%define libversion 7_3_0 Summary: Cross-platform library for making high-quality scientific graphics License: GPL-3.0 Group: Productivity/Scientific/Other Url: http://mathgl.sourceforge.net Source: http://downloads.sourceforge.net/mathgl/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM mathgl-fltk.patch -- Correct typo in fltk's include statements -Patch1: mathgl-fltk.patch # PATCH-FIX-UPSTREAM mathgl-fix-python-module-path.patch -- Make python modules install arch-depended -Patch2: mathgl-fix-python-module-path.patch +Patch1: mathgl-fix-python-module-path.patch # PATCH-FEATURE-UPSTREAM mathgl-examples-install.patch -- Enable examples install -Patch3: mathgl-examples-install.patch +Patch2: mathgl-examples-install.patch # PATCH-FIX-OPENSUSE mathgl-doc-path.patch -- Locate documentation to right place -Patch4: mathgl-doc-path.patch +Patch3: mathgl-doc-path.patch # PATCH-FIX-OPENSUSE udav-help-path.patch -- fix path to documentation directory -Patch5: udav-help-path.patch +Patch4: udav-help-path.patch BuildRequires: cmake BuildRequires: fltk-devel BuildRequires: freeglut-devel @@ -69,9 +68,13 @@ BuildRequires: swig BuildRequires: texinfo BuildRequires: texlive-latex +%if 0%{?suse_version} >= 1320 +BuildRequires: wxWidgets-devel >= 3 +%else BuildRequires: wxWidgets-devel %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -93,7 +96,7 @@ %package -n %{libname}%{libversion} Summary: Mathgl is a cross-platform library for making high-quality scientific graphics Group: System/Libraries -Requires: %{name}-fonts +Requires: %{name}-fonts >= %{version} %description -n %{libname}%{libversion} Mathgl is a cross-platform library for making high-quality scientific @@ -218,7 +221,7 @@ %package doc Summary: Documentation for %{name} -Group: Documentation/Other +Group: Documentation/HTML BuildArch: noarch %description doc @@ -228,12 +231,26 @@ into other programs. Mathgl integrates into fltk, qt and opengl applications. -This package provides the documentation for mathgl. +This package provides the documentation for mathgl in HTML format. + +%package doc-pdf +Summary: Documentation for %{name} +Group: Documentation/Other +BuildArch: noarch + +%description doc-pdf +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 the documentation for mathgl in PDF format. %package doc-ru Summary: Russian documentation for %{name} Group: Documentation/Other -Requires: mathgl-doc +Requires: mathgl-doc = %{version} BuildArch: noarch %description doc-ru @@ -331,7 +348,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 # Correct octave-mathgl version sed -i 's/2.0/%{oct_version}/' lang/DESCRIPTION @@ -343,6 +359,11 @@ # convert EOL encodings, maintaining timestames sed -i 's/\r$//' AUTHORS README +# workaround for qt5 headers, not controllable by enable-qt5 +%if 0%{?suse_version} <= 1310 +sed -i '/\#include <qt5\/QtCore\/QTimer>/d' widgets/qt.cpp +%endif + %build cmake \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ @@ -350,7 +371,7 @@ -Denable-double=on \ -Denable-mpi=off \ -Denable-pthread=off \ - -Denable-openmp=off \ + -Denable-openmp=on \ -Denable-gsl=on \ -Denable-jpeg=on \ -Denable-png=on \ @@ -370,7 +391,8 @@ -Denable-lua=on \ -Denable-octave=on \ -Denable-octave-install=off \ - -Denable-all-docs=on \ + -Denable-doc-html=on \ + -Denable-doc-pdf-en=on \ -Denable-texi2html=on \ . @@ -384,17 +406,13 @@ mkdir -p %{buildroot}%{_libdir}/octave/packages mkdir -p %{buildroot}%{_datadir}/octave/packages octave %{octave_args} --eval "pkg prefix %{buildroot}%{_datadir}/octave/packages %{buildroot}%{_libdir}/octave/packages; pkg install lang/%{name}.tar.gz" -rm %{buildroot}%{_datadir}/octave/packages/*/packinfo/.autoload +# rm %{buildroot}%{_datadir}/octave/packages/*/packinfo/.autoload # remove octave module archive rm %{buildroot}%{_datadir}/%{name}/%{name}.tar.gz # Install docs install -m 644 {AUTHORS,ChangeLog.txt,README,COPYING} %{buildroot}%{_docdir}/%{name}/ install -m 644 texinfo/{classes.pdf,mgl_en.pdf} %{buildroot}%{_docdir}/%{name}/ -install -d %{buildroot}%{_docdir}/%{name}/doc_en -install -m 644 texinfo/doc_en/* %{buildroot}%{_docdir}/%{name}/doc_en/ -install -d %{buildroot}%{_docdir}/%{name}/doc_ru -install -m 644 texinfo/doc_ru/* %{buildroot}%{_docdir}/%{name}/doc_ru/ # move mgl.cgi install -d %{buildroot}/srv/www/cgi-bin/ @@ -404,15 +422,15 @@ rm %{buildroot}%{_libdir}/libmgl-qt.so.%{somajor} ln -s libmgl-qt4.so.%{somajor} %{buildroot}%{_libdir}/libmgl-qt.so.%{somajor} -%post doc -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}_en.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}_en.info-1.gz -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}_en.info-2.gz - -%postun doc -%install_info_delete --info-dir=%_infodir %{_infodir}/%{name}_en.info.gz -%install_info_delete --info-dir=%_infodir %{_infodir}/%{name}_en.info-1.gz -%install_info_delete --info-dir=%_infodir %{_infodir}/%{name}_en.info-2.gz +# %%post doc +# %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info.gz +# %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info-1.gz +# %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info-2.gz +# +# %%postun doc +# %%install_info_delete --info-dir=%%_infodir %%{_infodir}/%%{name}_en.info.gz +# %%install_info_delete --info-dir=%%_infodir %%{_infodir}/%%{name}_en.info-1.gz +# %%install_info_delete --info-dir=%%_infodir %%{_infodir}/%%{name}_en.info-2.gz %post -n %{libname}%{libversion} -p /sbin/ldconfig @@ -497,22 +515,28 @@ %files doc %defattr(-,root,root) -%dir %{_defaultdocdir}/mathgl -%doc %{_defaultdocdir}/mathgl/doc_en/ -%doc %{_defaultdocdir}/mathgl/png/ -%doc %{_defaultdocdir}/mathgl/udav/ -%doc %{_defaultdocdir}/mathgl/*.html -%doc %{_defaultdocdir}/mathgl/*.pdf -%doc %{_defaultdocdir}/mathgl/*.png -%doc %{_defaultdocdir}/mathgl/AUTHORS -%doc %{_defaultdocdir}/mathgl/ChangeLog.txt -%doc %{_defaultdocdir}/mathgl/README -%doc %{_defaultdocdir}/mathgl/COPYING -%{_infodir}/%{name}_en.info*.gz +%dir %{_docdir}/mathgl +%doc %{_docdir}/mathgl/png/ +%doc %{_docdir}/mathgl/udav/ +%doc %{_docdir}/mathgl/*.html +%exclude %{_docdir}/mathgl/*.pdf +%doc %{_docdir}/mathgl/*.png +%doc %{_docdir}/mathgl/AUTHORS +%doc %{_docdir}/mathgl/ChangeLog.txt +%doc %{_docdir}/mathgl/README +%doc %{_docdir}/mathgl/COPYING +%exclude %{_docdir}/mathgl/mathgl_ru.html +%exclude %{_docdir}/mathgl/mgl_ru.html +# %%{_infodir}/%%{name}_en.info*.gz + +%files doc-pdf +%defattr(-,root,root) +%doc %{_docdir}/mathgl/*.pdf %files doc-ru %defattr(-,root,root) -%doc %{_defaultdocdir}/mathgl/doc_ru/ +%doc %{_docdir}/mathgl/mathgl_ru.html +%doc %{_docdir}/mathgl/mgl_ru.html %files examples %defattr(-,root,root) ++++++ mathgl-2.2.2.1.tar.gz -> mathgl-2.3.tar.gz ++++++ ++++ 50787 lines of diff (skipped) ++++++ mathgl-fix-python-module-path.patch ++++++ --- /var/tmp/diff_new_pack.FyPDSH/_old 2014-08-18 11:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.FyPDSH/_new 2014-08-18 11:23:55.000000000 +0200 @@ -1,9 +1,9 @@ -Index: mathgl-2.1/lang/CMakeLists.txt +Index: mathgl-2.3/lang/CMakeLists.txt =================================================================== ---- mathgl-2.1.orig/lang/CMakeLists.txt -+++ mathgl-2.1/lang/CMakeLists.txt -@@ -11,7 +11,7 @@ SET_SOURCE_FILES_PROPERTIES(mathgl.i num - if(MGL_HAVE_PYTHON) +--- mathgl-2.3.orig/lang/CMakeLists.txt ++++ mathgl-2.3/lang/CMakeLists.txt +@@ -36,7 +36,7 @@ if(enable-python) + include_directories(${PYTHON_INCLUDE_DIR}) execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}')" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org