Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2017-11-03 16:24:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mathgl (Old) and /work/SRC/openSUSE:Factory/.mathgl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mathgl" Fri Nov 3 16:24:33 2017 rev:41 rq:537842 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes 2016-10-23 12:53:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2017-11-03 16:25:07.967593575 +0100 @@ -1,0 +2,102 @@ +Fri Oct 27 12:50:09 UTC 2017 - [email protected] + +- Add Provides: mathgl for the libmathgl package, to make the + mathgl-lang package installable. + +------------------------------------------------------------------- +Thu Oct 26 08:35:54 UTC 2017 - [email protected] + +- Adapt to latest openmpi packaging changes: setup the openmpi + environment before calling cmake. + +------------------------------------------------------------------- +Sat Aug 26 15:05:58 UTC 2017 - [email protected] + +- Trim some irrelevant words from descriptions. + +------------------------------------------------------------------- +Wed Aug 16 15:41:29 UTC 2017 - [email protected] + +- Update to version 2.4.1: + * Add beltc plot, which is belt with manual coloring. + * Add style '~' for plot and tens to omit some points at output. + * Add style ':' for axis to draw lines through point (0,0,0). + * Miscellaneous bugfixes. +- Changes from version 2.4.0: + * Add mgllab executable, which is FLTK based version of UDAV. + * Add string manipulation in MGL language: + - 'str'[n] - get string of only n-th symbol; + - 'str'+v - add value v to the last character of the string; + - 'str',val or 'str',!val - append numeric value to the string + * Add time value to MGL language in format: + 'hh-mm-ss_DD.MM.YYYY' or 'hh-mm-ss' or 'DD.MM.YYYY'. + * Add iris plot to show cross-dependencies of several data + arrays. + * Add flame2d to draw flame fractals. + * Add bbox to set bounding box for 2D output. + * Add section to get part of data between specified values. + * Add detect to found curves along data maximums. + * Add dilate to extend the region of 1-th value. + * Add erode to narrow the region of 1-th value. + * Add apde to solve PDE equation in inhomogeneous nonlinear + media with spatial dispersion. + * Add symbol to draw the glyphs defined by addsymbol. + * Add addsymbol to declare user-defined symbol (or glyph), which + can be used as markers for plot (with style '&') or drawn + itself by symbol command. + * Add openhdf to open all data arrays from HDF file. + * Extend crop to cut to optimal size for FFT (i.e. to closest of + 2^n*3^m*5^l). + * Add function mgl_data_max_first() and data suffixes + .m[xyz][fl] to find first/last maximum along direction (see + Data information). + * Add function mgl_datac_diff_par() to parametric derivative of + complex data (see diff). + * Add style 'F' for bars and barh to set fixed bar widths. + * Add style 'a' for plot, tens, area and region to accurate + drawing of data, which partially lie out of axis range. + * Add style '#' for region to draw wired plot. + * Add possibility of manual shift in multiplot. + * Add parsing arguments of options for MGL commands. + * MGL command correl now can perform 2d and 3d correlations. + * Option meshnum now change the number of drawn markers for + plot, tens, step, mark and textmark. + * Function step handle data with x.nx>y.nx similarly to bars. + * Extend tile and tiles by adding manual coloring and face + orientation. + * Add variant of MGL command copy to copy data with "incorrect" + names. + * Improve tick labels drawing. + * Improve time-ticks (add weeks) and add subticks to its. + * Improve fplot to handle several singularities. + * Add LaTeX command \dfrac{}{}. This is full-sized version of + \frac{}{}. Unfortunately, there is no support of nesting. + Contrary, \frac allow nesting. + * Add mglODEc() - ODE solver for complex variables (see ode). + * Add cmplx(a,b)=a+i*b to the list of known functions in formula + parsing + * Update CMake find_package to find MathGL. + * Increase line width for wired text. + * Update documentation: add description of new commands, add + hint Mixing bitmap and vector output. + * Add translation to Russian for most of labels and messages. + * Name all are reserved in MGL scripts now as synonym of -1. + * INCOMPATIBLE: Replace libmgl-qt by libmgl-qt4 and libmgl-qt5 + for resolving conflicts of simultaneously installed both Qt4 + and Qt5. + * Minor bugfixes. +- Drop mathgl-oldtexinfo.patch: fixed upstream. +- Add mathgl-fltk-includedir.patch to fix include directives for + fltk headers. +- Split out a -lang package. +- Package the binary and desktop file for mgllab as part of the + -udav package; their desktop files share the same icon + unfortunately. +- Disable doc for openSUSE <= 1320; no longer builds with old + texi2html there. +- Move AUTHORS, ChangeLog.txt, README, COPYING to -devel package + for all openSUSE versions; package it using %%doc. +- Add _constraints file to require at least 2 GB of physical + memory on obs; otherwise builds on 64-bit openSUSE > 1320 fail. + +------------------------------------------------------------------- Old: ---- mathgl-2.3.5.1.tar.gz mathgl-oldtexinfo.patch New: ---- _constraints mathgl-2.4.1.tar.gz mathgl-fltk-includedir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.e1oFoy/_old 2017-11-03 16:25:09.963520932 +0100 +++ /var/tmp/diff_new_pack.e1oFoy/_new 2017-11-03 16:25:09.963520932 +0100 @@ -1,7 +1,7 @@ # # spec file for package mathgl # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,17 +20,17 @@ %define libname libmgl # oct_version must be x.y.z %define oct_version %{version} -%define somajor 7.4.3 -%define libversion 7_4_3 +%define somajor 7.5.0 +%define libversion 7_5_0 %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) %define enable_octave 0 %else %define enable_octave 0 %endif Name: mathgl -Version: 2.3.5.1 +Version: 2.4.1 Release: 0 -Summary: Cross-platform library for making high-quality scientific graphics +Summary: Library for making scientific graphics License: GPL-3.0 Group: Productivity/Scientific/Other Url: http://mathgl.sourceforge.net @@ -46,8 +46,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-OPENSUSE mathgl-oldtexinfo.patch -- fix build with old texinfo -Patch6: mathgl-oldtexinfo.patch +# PATCH-FIX-UPSTREAM mathgl-fltk-includedir.patch [email protected] -- Fix inclusion of fltk headers +Patch6: mathgl-fltk-includedir.patch BuildRequires: cmake >= 2.8.12 BuildRequires: desktop-file-utils BuildRequires: fltk-devel @@ -68,6 +68,7 @@ BuildRequires: python-devel BuildRequires: python-numpy-devel BuildRequires: swig +BuildRequires: sz2-devel BuildRequires: texinfo BuildRequires: texlive-filesystem BuildRequires: texlive-latex @@ -96,115 +97,99 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding 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: Library for making scientific graphics Group: System/Libraries Requires: %{name}-fonts >= %{version} +Provides: %{name} = %{version} # FIXME temporary, octave-mathgl is inconsistent with octave 4.0 due to SWIG %if 0%{?suse_version} < 1315 || 0%{?suse_version} == 1320 Obsoletes: octave-mathgl %endif %description -n %{libname}%{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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package -n %{libname}-mpi%{libversion} Summary: MathGL library with MPI support Group: System/Libraries %description -n %{libname}-mpi%{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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package -n %{libname}-fltk%{libversion} -Summary: MathGL FLTK widget library for making high-quality scientific graphics +Summary: MathGL FLTK widget library Group: System/Libraries %description -n %{libname}-fltk%{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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package -n %{libname}-glut%{libversion} -Summary: MathGL window library for making high-quality scientific graphics +Summary: MathGL window library Group: System/Libraries %description -n %{libname}-glut%{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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package -n %{libname}-qt4-%{libversion} 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 -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package -n %{libname}-qt5-%{libversion} -Summary: MathGL Qt5 widget library for making high-quality scientific graphics +Summary: MathGL Qt5 widget library 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 -into other programs. MathGL integrates into FLTK, Qt and -OpenGL applications. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package -n %{libname}-wnd%{libversion} -Summary: MathGL window library for making high-quality scientific graphics +Summary: MathGL window library Group: System/Libraries %description -n %{libname}-wnd%{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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package -n %{libname}-wx%{libversion} -Summary: MathGL wxWidget library for making high-quality scientific graphics +Summary: MathGL wxWidgets library Group: System/Libraries %description -n %{libname}-wx%{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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. %package cgi Summary: MathGL CGI binary Group: Productivity/Scientific/Other %description cgi -This package contains mathGL binary for parsing CGI scripts. +This package contains the MathGL binary for parsing CGI scripts. %package devel -Summary: Libraries and header files for MathGL library -Group: Development/Libraries/Other +Summary: Libraries and header files for the MathGL library +Group: Development/Libraries/C and C++ Requires: %{libname}%{libversion} = %{version} Requires: %{libname}-fltk%{libversion} = %{version} Requires: %{libname}-glut%{libversion} = %{version} @@ -220,26 +205,22 @@ %endif %description devel -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package contains libraries and header files for developing applications that use MathGL. %package devel-static -Summary: Static libraries for MathGL library -Group: Development/Libraries/Other +Summary: Static libraries for MathGL +Group: Development/Libraries/C and C++ Requires: mathgl-devel = %{version} %description devel-static -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package contains static libraries for developing applications that use MathGL. @@ -250,25 +231,21 @@ BuildArch: noarch %description 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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package provides the documentation for MathGL in HTML format. %package doc-pdf Summary: Documentation for MathGL -Group: Documentation/Other +Group: Documentation/PDF 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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package provides the documentation for MathGL in PDF format. @@ -280,11 +257,9 @@ BuildArch: noarch %description doc-ru -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package provides Russian documentation for MathGL. @@ -293,16 +268,14 @@ Group: Productivity/Scientific/Other %description examples -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package contains examples of using MathGL. %package fonts -Summary: Fonts for MathGL library +Summary: Fonts for the MathGL library Group: System/X11/Fonts BuildArch: noarch @@ -310,50 +283,44 @@ This package contains command fonts for MathGL library. %package lua -Summary: Lua interface for MathGL library +Summary: Lua interface for the MathGL library Group: Productivity/Scientific/Other %description lua -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package provides lua interface for MathGL. %if 0%{?enable_octave} %package -n octave-mathgl -Summary: Octave interface for MathGL library +Summary: Octave interface for the MathGL library Group: Productivity/Scientific/Other Requires: octave-cli %description -n octave-mathgl -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package provides Octave interface for MathGL. %endif %package -n python-mathgl -Summary: Libraries and header files for MathGL library +Summary: Libraries and header files for the MathGL library Group: Productivity/Scientific/Other Requires: python-base %description -n python-mathgl -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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package provides the python bindings for MathGL. %package tex -Summary: MathGL scripts in LaTeX document +Summary: MathGL scripts for LaTeX documents Group: Productivity/Publishing/TeX/Base Requires: mathgl-tools >= %{version} Requires(post): coreutils @@ -366,11 +333,9 @@ BuildArch: noarch %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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package allows to use MathGL scripts in LaTeX documents. @@ -380,31 +345,31 @@ 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. +MathGL is a library for making scientific graphics. It provides data +plotting and handling of large data arrays, as well as window and +console modes and for embedding into other programs. This package provides documentation for mglTeX. %package tools -Summary: Command line tools for MathGL library +Summary: Command line tools for the MathGL library Group: Productivity/Scientific/Other %description tools -This package contains command line tools for making high-quality scientific graphics. +This package contains command line tools for making scientific graphics. %package -n udav Summary: Data handling and plotting tool Group: Productivity/Scientific/Other %description -n udav -UDAV is cross-platform program for data arrays visualization based -on MathGL library. It support wide spectrum of graphics, -simple script language and visual data handling and editing. It has -window interface for data viewing, changing and plotting.Also it -can execute MGL scripts, setup and rotate graphics and so on. +UDAV is a program for data array visualization using the MathGL +library. It support a wide spectrum of graphics, a simple script +language and visual data handling and editing. It has a window +interface for data viewing, changing and plotting. It can also +execute MGL scripts, set up, rotate graphics, and so on. + +%lang_package %prep %setup -q @@ -413,9 +378,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%if 0%{?suse_version} <= 1320 %patch6 -p1 -%endif # Correct octave-mathgl version sed -i 's/2.0/%{oct_version}/' lang/DESCRIPTION @@ -428,10 +391,14 @@ sed -i 's/\r$//' AUTHORS README %build +if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then + source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh +fi + # FIXME: you should use %%cmake macros cmake \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DMGL_LIB_INSTALL_DIR:PATH=%{_lib} \ + -DMathGL_INSTALL_LIB_DIR:PATH=%{_lib} \ -DTEXMFDIR:PATH=%{_datadir}/texmf/ \ -DCMAKE_C_FLAGS="%{optflags}" \ -DCMAKE_CXX_FLAGS="%{optflags}" \ @@ -465,10 +432,12 @@ -Denable-octave-install=off \ -Denable-mgltex=on \ -Denable-json-sample=off \ + %if 0%{?suse_version} > 1320 -Denable-doc-html=on \ -Denable-doc-pdf-en=on \ - %if 0%{?suse_version} <= 1320 - -Denable-texi2html=on \ + %else + -Denable-doc-html=off \ + -Denable-doc-pdf-en=off \ %endif . @@ -489,8 +458,9 @@ %endif # Install docs -install -m 644 {AUTHORS,ChangeLog.txt,README,COPYING} %{buildroot}%{_docdir}/%{name}/ +%if 0%{?suse_version} > 1320 install -m 644 texinfo/{classes.pdf,mgl_en.pdf} %{buildroot}%{_docdir}/%{name}/ +%endif # move mgl.cgi install -d %{buildroot}/srv/www/cgi-bin/ @@ -501,6 +471,8 @@ ln -sf %{_datadir}/texmf/texconfig/zypper.py \ %{buildroot}%{_localstatedir}/adm/update-scripts/texlive-mgltex-%{version}-%{release}-zypper +%find_lang %{name} + # %%post doc # %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info.gz # %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info-1.gz @@ -597,18 +569,24 @@ %files cgi %defattr(-,root,root) /srv/www/cgi-bin/mgl.cgi +%if 0%{?suse_version} > 1320 %{_mandir}/man1/mgl.cgi.1%{ext_man} +%endif %files devel %defattr(-,root,root) +%doc AUTHORS ChangeLog.txt README COPYING %{_includedir}/mgl2/ %{_libdir}/libmgl*.so %{_libdir}/cmake/mathgl2/ +%files lang -f %{name}.lang + %files devel-static %defattr(-,root,root) %{_libdir}/*.a +%if 0%{?suse_version} > 1320 %files doc %defattr(-,root,root) %dir %{_docdir}/mathgl @@ -617,10 +595,6 @@ %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 @@ -633,6 +607,7 @@ %defattr(-,root,root) %doc %{_docdir}/mathgl/mathgl_ru.html %doc %{_docdir}/mathgl/mgl_ru.html +%endif %files examples %defattr(-,root,root) @@ -671,9 +646,11 @@ %defattr(-,root,root) %{_bindir}/mglconv %{_bindir}/mglview +%if 0%{?suse_version} > 1320 %{_mandir}/man1/mglconv.1%{ext_man} %{_mandir}/man1/mglview.1%{ext_man} %{_mandir}/man5/mgl.5%{ext_man} +%endif %files -n udav %defattr(-,root,root) @@ -682,6 +659,12 @@ %{_datadir}/applications/udav.desktop %{_datadir}/mime/packages/mgl.xml %{_datadir}/udav/ +%if 0%{?suse_version} > 1320 %{_mandir}/man1/udav.1%{ext_man} +%endif +# mgllab's .desktop file uses the same icon as udav's, so we have to bundle them in the same package +%{_bindir}/mgllab +%{_datadir}/applications/mgllab.desktop +# %changelog ++++++ _constraints ++++++ <constraints> <hardware> <physicalmemory> <size unit="G">2</size> </physicalmemory> </hardware> </constraints> ++++++ mathgl-2.3.5.1.tar.gz -> mathgl-2.4.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/mathgl/mathgl-2.3.5.1.tar.gz /work/SRC/openSUSE:Factory/.mathgl.new/mathgl-2.4.1.tar.gz differ: char 5, line 1 ++++++ mathgl-doc-path.patch ++++++ --- /var/tmp/diff_new_pack.e1oFoy/_old 2017-11-03 16:25:10.019518893 +0100 +++ /var/tmp/diff_new_pack.e1oFoy/_new 2017-11-03 16:25:10.023518748 +0100 @@ -1,8 +1,8 @@ -Index: mathgl-2.1.3/CMakeLists.txt +Index: mathgl-2.4.1/CMakeLists.txt =================================================================== ---- mathgl-2.1.3.orig/CMakeLists.txt -+++ mathgl-2.1.3/CMakeLists.txt -@@ -92,7 +92,7 @@ set(MGL_CGI_PATH "${CMAKE_INSTALL_PREFIX +--- mathgl-2.4.1.orig/CMakeLists.txt ++++ mathgl-2.4.1/CMakeLists.txt +@@ -241,7 +241,7 @@ set(MGL_DEF_FONT "STIX" CACHE STRING "Se if(NOT WIN32) # set(MGL_CGI_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl") set(MGL_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl") ++++++ mathgl-examples-install.patch ++++++ --- /var/tmp/diff_new_pack.e1oFoy/_old 2017-11-03 16:25:10.035518311 +0100 +++ /var/tmp/diff_new_pack.e1oFoy/_new 2017-11-03 16:25:10.035518311 +0100 @@ -1,8 +1,9 @@ -Index: mathgl-2.3.5.1/examples/CMakeLists.txt +Index: mathgl-2.4.1/examples/CMakeLists.txt =================================================================== ---- mathgl-2.3.5.1.orig/examples/CMakeLists.txt -+++ mathgl-2.3.5.1/examples/CMakeLists.txt -@@ -1,21 +1,37 @@ +--- mathgl-2.4.1.orig/examples/CMakeLists.txt ++++ mathgl-2.4.1/examples/CMakeLists.txt +@@ -2,22 +2,38 @@ file(COPY ${CMAKE_SOURCE_DIR}/examples/i + file(COPY ${CMAKE_SOURCE_DIR}/examples/Equirectangular-projection.jpg DESTINATION ${CMAKE_BINARY_DIR}/examples) add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) target_link_libraries(mgl_example mgl-static ${getopt_lib-static}) +install( @@ -40,16 +41,16 @@ endif(MGL_HAVE_WX) if(QT_ENABLED) -@@ -23,17 +39,33 @@ if(QT_ENABLED) +@@ -25,17 +41,33 @@ if(QT_ENABLED) if(enable-qt5) - include(../cmake-qt5.txt) + include(../scripts/qt5.cmake) target_link_libraries(mgl_qt_example mgl-qt5) + install( + TARGETS mgl_qt_example + RUNTIME DESTINATION bin + ) else(enable-qt5) - include(../cmake-qt4.txt) + include(../scripts/qt4.cmake) target_link_libraries(mgl_qt_example mgl-qt4) + install( + TARGETS mgl_qt_example ++++++ mathgl-fix-python-module-path.patch ++++++ --- /var/tmp/diff_new_pack.e1oFoy/_old 2017-11-03 16:25:10.047517874 +0100 +++ /var/tmp/diff_new_pack.e1oFoy/_new 2017-11-03 16:25:10.051517729 +0100 @@ -1,7 +1,7 @@ -Index: mathgl-2.3.2/lang/CMakeLists.txt +Index: mathgl-2.4.1/lang/CMakeLists.txt =================================================================== ---- mathgl-2.3.2.orig/lang/CMakeLists.txt -+++ mathgl-2.3.2/lang/CMakeLists.txt +--- mathgl-2.4.1.orig/lang/CMakeLists.txt ++++ mathgl-2.4.1/lang/CMakeLists.txt @@ -39,7 +39,7 @@ if(enable-python) include_directories(${PYTHON_INCLUDE_DIR} ${NUMPY_INCLUDE_PATH}) ++++++ mathgl-fltk-includedir.patch ++++++ Index: mathgl-2.4.1/mgllab/mgllab.cpp =================================================================== --- mathgl-2.4.1.orig/mgllab/mgllab.cpp +++ mathgl-2.4.1/mgllab/mgllab.cpp @@ -19,10 +19,10 @@ #include <locale.h> #include <getopt.h> #include "mgllab.h" -#include <Fl/Fl_Spinner.H> -#include <Fl/Fl_Output.H> -#include <Fl/Fl_Select_Browser.H> -#include <Fl/Fl_Printer.H> +#include <FL/Fl_Spinner.H> +#include <FL/Fl_Output.H> +#include <FL/Fl_Select_Browser.H> +#include <FL/Fl_Printer.H> //----------------------------------------------------------------------------- #ifndef MGL_DOC_DIR #ifdef WIN32 Index: mathgl-2.4.1/mgllab/mgllab.h =================================================================== --- mathgl-2.4.1.orig/mgllab/mgllab.h +++ mathgl-2.4.1/mgllab/mgllab.h @@ -34,14 +34,14 @@ #include <FL/Fl_Text_Editor.H> #include <FL/Fl_Pixmap.H> #include <FL/Fl_Counter.H> -#include <Fl/Fl_Scroll.H> +#include <FL/Fl_Scroll.H> #include <FL/Fl_Tabs.H> #include <FL/Fl_Help_View.H> -#include <Fl/Fl_Table.H> -#include <Fl/Fl_Round_Button.H> -#include <Fl/Fl_Float_Input.H> -#include <Fl/Fl_Multiline_Input.H> -#include <Fl/Fl_Multiline_Output.H> +#include <FL/Fl_Table.H> +#include <FL/Fl_Round_Button.H> +#include <FL/Fl_Float_Input.H> +#include <FL/Fl_Multiline_Input.H> +#include <FL/Fl_Multiline_Output.H> //----------------------------------------------------------------------------- #include "mgl2/Fl_MathGL.h" //----------------------------------------------------------------------------- Index: mathgl-2.4.1/utils/mglview.cpp =================================================================== --- mathgl-2.4.1.orig/utils/mglview.cpp +++ mathgl-2.4.1/utils/mglview.cpp @@ -23,8 +23,8 @@ #include "mgl2/mgl.h" #if USE_FLTK #include "mgl2/fltk.h" - #include <Fl/Fl.H> - #include <Fl/Fl_Preferences.H> + #include <FL/Fl.H> + #include <FL/Fl_Preferences.H> #else #include "mgl2/qt.h" #endif Index: mathgl-2.4.1/widgets/image.h =================================================================== --- mathgl-2.4.1.orig/widgets/image.h +++ mathgl-2.4.1/widgets/image.h @@ -18,7 +18,7 @@ #ifndef IMAGE_H #define IMAGE_H //----------------------------------------------------------------------------- -#include <Fl/Fl_RGB_Image.H> +#include <FL/Fl_RGB_Image.H> extern MGL_EXPORT Fl_RGB_Image img_load; extern MGL_EXPORT Fl_RGB_Image img_save; ++++++ mathgl-texmf-dir.patch ++++++ --- /var/tmp/diff_new_pack.e1oFoy/_old 2017-11-03 16:25:10.083516565 +0100 +++ /var/tmp/diff_new_pack.e1oFoy/_new 2017-11-03 16:25:10.083516565 +0100 @@ -1,7 +1,7 @@ -Index: mathgl-2.3.4/mgltex/CMakeLists.txt +Index: mathgl-2.4.1/mgltex/CMakeLists.txt =================================================================== ---- mathgl-2.3.4.orig/mgltex/CMakeLists.txt -+++ mathgl-2.3.4/mgltex/CMakeLists.txt +--- mathgl-2.4.1.orig/mgltex/CMakeLists.txt ++++ mathgl-2.4.1/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.") @@ -22,9 +22,9 @@ 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 ${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(FILES ${MathGL2_BINARY_DIR}/mgltex/mgltex.sty DESTINATION ${TEXMFLOCALDIR}/tex/latex/mgltex/) +-install(FILES sample.tex mgltex.pdf ${MathGL2_BINARY_DIR}/mgltex/sample.pdf DESTINATION ${TEXMFLOCALDIR}/doc/latex/mgltex/) -install(CODE "execute_process(COMMAND ${findmktexlsr} ${TEXMFLOCALDIR})") -+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(FILES ${MathGL2_BINARY_DIR}/mgltex/mgltex.sty DESTINATION ${TEXMFDIR}/tex/latex/mgltex/) ++install(FILES sample.tex mgltex.pdf ${MathGL2_BINARY_DIR}/mgltex/sample.pdf DESTINATION ${TEXMFDIR}/doc/latex/mgltex/) +install(CODE "execute_process(COMMAND ${findmktexlsr} ${TEXMFDIR})") ++++++ udav-help-path.patch ++++++ --- /var/tmp/diff_new_pack.e1oFoy/_old 2017-11-03 16:25:10.099515982 +0100 +++ /var/tmp/diff_new_pack.e1oFoy/_new 2017-11-03 16:25:10.099515982 +0100 @@ -1,7 +1,7 @@ -Index: mathgl-2.1/udav/udav_wnd.h +Index: mathgl-2.4.1/udav/udav_wnd.h =================================================================== ---- mathgl-2.1.orig/udav/udav_wnd.h -+++ mathgl-2.1/udav/udav_wnd.h +--- mathgl-2.4.1.orig/udav/udav_wnd.h ++++ mathgl-2.4.1/udav/udav_wnd.h @@ -26,7 +26,7 @@ #ifdef WIN32 #define MGL_DOC_DIR ""
