Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2014-01-30 06:55:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-12-18 07:51:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2014-01-30 06:55:27.000000000 +0100 @@ -1,0 +2,31 @@ +Sun Jan 26 19:52:23 UTC 2014 - [email protected] + +- Update to version 2.2.1 + * Add Qt5 support. + * Add Pascal interface. + * Improve JavaScript interface. + * Add function AddRange(char dir, mreal v1, mreal v2) and extend + corresponding MGL commands '[xyzc]range'. + * Add 'hypot' function for known functions in formula parsing. + * Add style '~' to disable colorbar or axis labels. NOTE, axis + style '_' is obsolete and should be replaced by '~'. + * Change Aspect() if Ax=NAN. Now, Ay and Az set the ratio to + optimal aspect (not exact value as previously). + * Disable changes by View(),Zoom(),Perspective() for position + of Title(), Legend(), Colorbar(). + * Partial support of perspective in CalcXYZ(). + * Speed up PDE solving. + * Add complex versions of PDE, QO2d, QO3d. + * Correct filled background for Box() in curved coordinates. + * Allow nx=1 for Stem and Error. + * Bugfix for drawing single axis. + * Bugfix for missing options parsing for some of MGL commands. + * Bugfix for .pmin suffix in MGL. Add mglData::MaximalNeg() and + mglData::MinimalPos() functions. Add .nmin and .nmax suffixes. + * Bugfix for colorbar labels. + * Force using python 2.7 by default. + * Minor bugfixes and memory leaks. +- Disable Octave interface due to Octave 3.8.0 changes +- Disable openmp support due to instability + +------------------------------------------------------------------- Old: ---- mathgl-2.2.tar.gz New: ---- mathgl-2.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.K5IaSv/_old 2014-01-30 06:55:27.000000000 +0100 +++ /var/tmp/diff_new_pack.K5IaSv/_new 2014-01-30 06:55:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mathgl # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,11 @@ Name: mathgl %define libname libmgl -Version: 2.2 +Version: 2.2.1 Release: 0 -%define oct_version 2.2.0 -%define somajor 7.1.0 -%define libversion 7_1_0 +%define oct_version %{version} +%define somajor 7.2.0 +%define libversion 7_2_0 Summary: Cross-platform library for making high-quality scientific graphics License: GPL-3.0 Group: Productivity/Scientific/Other @@ -54,10 +54,15 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libqt4-devel >= 4.8 +%if 0%{?suse_version} >= 1320 +BuildRequires: libQt5WebKit5-devel +BuildRequires: libQt5WebKitWidgets-devel +BuildRequires: libqt5-qtbase-devel +%endif BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: lua51-devel -BuildRequires: octave-devel +# BuildRequires: octave-devel # BuildRequires: openmpi-devel BuildRequires: python-devel BuildRequires: python-numpy-devel @@ -119,11 +124,22 @@ into other programs. Mathgl integrates into fltk, qt and opengl applications. -%package -n %{libname}-qt%{libversion} +%package -n %{libname}-qt4-%{libversion} Summary: Mathgl Qt4 widget library for making high-quality scientific graphics Group: System/Libraries -%description -n %{libname}-qt%{libversion} +%description -n %{libname}-qt4-%{libversion} +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. + +%package -n %{libname}-qt5-%{libversion} +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 graphics. It provides fast data plotting and handling of large data arrays, as well as window and console modes and for easy embedding @@ -165,7 +181,8 @@ Requires: %{libname}%{libversion} = %{version} Requires: %{libname}-fltk%{libversion} = %{version} Requires: %{libname}-glut%{libversion} = %{version} -Requires: %{libname}-qt%{libversion} = %{version} +Requires: %{libname}-qt4-%{libversion} = %{version} +Requires: %{libname}-qt5-%{libversion} = %{version} Requires: %{libname}-wnd%{libversion} = %{version} Requires: %{libname}-wx%{libversion} = %{version} %if 0%{?suse_version} @@ -327,12 +344,11 @@ %build cmake \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DLIB_INSTALL_DIR:PATH=%{_lib} \ -DMGL_LIB_INSTALL_DIR:PATH=%{_lib} \ -Denable-double=on \ -Denable-mpi=off \ -Denable-pthread=off \ - -Denable-openmp=on \ + -Denable-openmp=off \ -Denable-gsl=on \ -Denable-jpeg=on \ -Denable-png=on \ @@ -344,10 +360,13 @@ -Denable-glut=on \ -Denable-fltk=on \ -Denable-wx=on \ - -Denable-qt=on \ + -Denable-qt4=on \ + %if 0%{?suse_version} >= 1320 + -Denable-qt5=on \ + %endif -Denable-python=on \ -Denable-lua=on \ - -Denable-octave=on \ + -Denable-octave=off \ -Denable-octave-install=off \ -Denable-all-docs=on \ -Denable-texi2html=on \ @@ -358,14 +377,14 @@ %install %make_install -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} -# Install octave-mathgl -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 -# remove octave module archive -rm %{buildroot}%{_datadir}/%{name}/%{name}.tar.gz +# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} +# # Install octave-mathgl +# 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 +# # remove octave module archive +# rm %{buildroot}%{_datadir}/%{name}/%{name}.tar.gz # Install docs install -m 644 {AUTHORS,ChangeLog.txt,README,COPYING} %{buildroot}%{_docdir}/%{name}/ @@ -401,9 +420,15 @@ %postun -n %{libname}-glut%{libversion} -p /sbin/ldconfig -%post -n %{libname}-qt%{libversion} -p /sbin/ldconfig +%post -n %{libname}-qt4-%{libversion} -p /sbin/ldconfig + +%postun -n %{libname}-qt4-%{libversion} -p /sbin/ldconfig -%postun -n %{libname}-qt%{libversion} -p /sbin/ldconfig +%if 0%{?suse_version} >= 1320 +%post -n %{libname}-qt5-%{libversion} -p /sbin/ldconfig + +%postun -n %{libname}-qt5-%{libversion} -p /sbin/ldconfig +%endif %post -n %{libname}-wnd%{libversion} -p /sbin/ldconfig @@ -431,9 +456,16 @@ %defattr(-,root,root) %{_libdir}/libmgl-glut.so.%{somajor}* -%files -n %{libname}-qt%{libversion} +%files -n %{libname}-qt4-%{libversion} %defattr(-,root,root) %{_libdir}/libmgl-qt.so.%{somajor}* +%{_libdir}/libmgl-qt4.so.%{somajor}* + +%if 0%{?suse_version} >= 1320 +%files -n %{libname}-qt5-%{libversion} +%defattr(-,root,root) +%{_libdir}/libmgl-qt5.so.%{somajor}* +%endif %files -n %{libname}-wnd%{libversion} %defattr(-,root,root) @@ -489,10 +521,10 @@ %defattr(-,root,root) %{_libdir}/mgl-lua.so -%files -n octave-mathgl -%defattr(-,root,root) -%{_datadir}/octave/packages/%{name}-%{oct_version}/ -%{_libdir}/octave/packages/%{name}-%{oct_version}/ +# %files -n octave-mathgl +# %defattr(-,root,root) +# %{_datadir}/octave/packages/%{name}-%{oct_version}/ +# %{_libdir}/octave/packages/%{name}-%{oct_version}/ %files -n python-mathgl %defattr(-,root,root) ++++++ mathgl-2.2.tar.gz -> mathgl-2.2.1.tar.gz ++++++ ++++ 12971 lines of diff (skipped) ++++++ mathgl-examples-install.patch ++++++ --- /var/tmp/diff_new_pack.K5IaSv/_old 2014-01-30 06:55:28.000000000 +0100 +++ /var/tmp/diff_new_pack.K5IaSv/_new 2014-01-30 06:55:28.000000000 +0100 @@ -1,7 +1,7 @@ -Index: mathgl-2.1.3/examples/CMakeLists.txt +Index: mathgl-2.2.1/examples/CMakeLists.txt =================================================================== ---- mathgl-2.1.3.orig/examples/CMakeLists.txt -+++ mathgl-2.1.3/examples/CMakeLists.txt +--- mathgl-2.2.1.orig/examples/CMakeLists.txt ++++ mathgl-2.2.1/examples/CMakeLists.txt @@ -4,22 +4,38 @@ endif(MGL_HAVE_GSL) add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) @@ -24,7 +24,7 @@ if(MGL_HAVE_GLUT) add_executable(mgl_glut_example wnd_samples.cpp glut_example.cpp) target_link_libraries(mgl_glut_example mgl-glut) -+ install( ++ install( + TARGETS mgl_glut_example + RUNTIME DESTINATION bin + ) @@ -34,19 +34,27 @@ include(${wxWidgets_USE_FILE}) add_executable(mgl_wx_example wnd_samples.cpp wx_example.cpp) target_link_libraries(mgl_wx_example mgl-wx) -+ install( ++ install( + TARGETS mgl_wx_example + RUNTIME DESTINATION bin + ) endif(MGL_HAVE_WX) - if(MGL_HAVE_QT) -@@ -27,4 +43,8 @@ if(MGL_HAVE_QT) - # qt_wrap_cpp(mgl_qt_example MGL_MOC_EX_FILES ../include/mgl2/qt.h) - add_executable(mgl_qt_example wnd_samples.cpp qt_example.cpp ${MGL_MOC_EX_FILES}) - target_link_libraries(mgl_qt_example mgl-qt) -+ install( + if(enable-qt) +@@ -27,8 +43,16 @@ if(enable-qt) + if(enable-qt5) + include(../cmake-qt5.txt) + target_link_libraries(mgl_qt_example mgl-qt5) ++ install( + TARGETS mgl_qt_example + RUNTIME DESTINATION bin -+ ) - endif(MGL_HAVE_QT) ++ ) + else(enable-qt5) + include(../cmake-qt4.txt) + target_link_libraries(mgl_qt_example mgl-qt4) ++ install( ++ TARGETS mgl_qt_example ++ RUNTIME DESTINATION bin ++ ) + endif(enable-qt5) + endif(enable-qt) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
