Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2020-07-29 17:21:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mathgl (Old) and /work/SRC/openSUSE:Factory/.mathgl.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mathgl" Wed Jul 29 17:21:03 2020 rev:48 rq:823288 version:2.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes 2019-11-07 23:21:20.084845819 +0100 +++ /work/SRC/openSUSE:Factory/.mathgl.new.3592/mathgl.changes 2020-07-29 17:22:55.396685494 +0200 @@ -1,0 +2,26 @@ +Wed Jun 10 00:39:40 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Update to version 2.4.4: + * Add minmax for positions of local maximums and minimums. + * Add ContGen() and ContFGen() to draw contour lines manually. + Correspondingly cont and contf commands are extended. + * Add conts for coordinate of contour lines. + * Extend put for partial filling if data size(s) are smaller as + destination. + * Classes mglFormula and mglFormulaC now can read file with + given sizes if string have the format + ":fname:x1:x2:y1:y2:z1:z2". Here data is supposed in range + [x1,x2]*[y1,y2]*[z1,z2] (by default [0,1]*[0,1]*[0,1]). Calc() + in this case return the interpolated values. + * mglData now have operator() which work as SubData() function. + * Minor bugfixes. +- Disable python bindings where python2 is unavailable (still no + python3 support from upstream unfortunately). +- Drop conditionals for old, unsupported openSUSE versions. +- Enable octave bindings for openSUSE versions > 1500 (doesn't + work with octave version in Leap 15.1, 15.2). +- Run spec-cleaner for minor specfile cleanups. +- Drop qt4 package definitions. +- Drop Group tags from packages. + +------------------------------------------------------------------- Old: ---- mathgl-2.4.3.tar.gz New: ---- mathgl-2.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.CBca4w/_old 2020-07-29 17:22:59.000688595 +0200 +++ /var/tmp/diff_new_pack.CBca4w/_new 2020-07-29 17:22:59.000688595 +0200 @@ -1,7 +1,7 @@ # # spec file for package mathgl # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,29 +18,38 @@ %define octave_args --no-window-system --norc %define libname libmgl - %if 0%{?suse_version} >= 1550 %define omp_ver 1 %else %define omp_ver %{nil} %endif - +# NO PYTHON3 SUPPORT FROM UPSTREAM +%if 0%{?suse_version} > 1500 +%bcond_with python +%else +%bcond_without python +%endif # oct_version must be x.y.z %define oct_version %{version} %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 + +# NOT COMPATIBLE WITH OCTAVE IN LEAP 15.1, 15.2 +%if 0%{?suse_version} <= 1500 +%bcond_with octave %else -%define enable_octave 0 +%bcond_without octave +%endif + +%if 0%{?fedora_version} +%define _defaultdocdir %{_docdir} %endif Name: mathgl -Version: 2.4.3 +Version: 2.4.4 Release: 0 Summary: Library for making scientific graphics License: GPL-3.0-only -Group: Productivity/Scientific/Other -Url: http://mathgl.sourceforge.net +URL: http://mathgl.sourceforge.net Source0: http://downloads.sourceforge.net/mathgl/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM mathgl-fix-python-module-path.patch -- Make python modules install arch-depended @@ -63,47 +72,35 @@ BuildRequires: giflib-devel BuildRequires: gsl-devel BuildRequires: hdf5-devel +BuildRequires: libQt5WebKit5-devel +BuildRequires: libQt5WebKitWidgets-devel BuildRequires: libharu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libqt5-qtbase-devel BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: lua51-devel BuildRequires: openmpi%{omp_ver}-devel -BuildRequires: python-devel -BuildRequires: python-numpy-devel BuildRequires: swig BuildRequires: sz2-devel BuildRequires: texinfo BuildRequires: texlive-filesystem BuildRequires: texlive-latex -%if 0%{?suse_version} < 1330 -BuildRequires: libQtWebKit-devel -BuildRequires: libqt4-devel >= 4.8 -%endif -%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) -BuildRequires: libQt5WebKit5-devel -BuildRequires: libQt5WebKitWidgets-devel -BuildRequires: libqt5-qtbase-devel +BuildRequires: wxWidgets-devel >= 3 +%if %{with python} +BuildRequires: python-devel +BuildRequires: python-numpy-devel %endif -%if 0%{?enable_octave} +%if %{with octave} BuildRequires: octave-devel %endif -%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) -BuildRequires: wxWidgets-devel >= 3 -%else -%define _use_internal_dependency_generator 0 -%define __find_requires %{wx_requires} -BuildRequires: wxWidgets-devel -%endif %if 0%{?fedora_version} -%define _defaultdocdir %{_datadir}/doc/packages BuildRequires: fltk-fluid BuildRequires: libXmu-devel BuildRequires: texi2html BuildRequires: texinfo-tex %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description MathGL is a library for making scientific graphics. It provides data @@ -113,13 +110,8 @@ %package -n %{libname}%{libversion} 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 library for making scientific graphics. It provides data @@ -128,7 +120,6 @@ %package -n %{libname}-mpi%{libversion} Summary: MathGL library with MPI support -Group: System/Libraries %description -n %{libname}-mpi%{libversion} MathGL is a library for making scientific graphics. It provides data @@ -137,7 +128,6 @@ %package -n %{libname}-fltk%{libversion} Summary: MathGL FLTK widget library -Group: System/Libraries %description -n %{libname}-fltk%{libversion} MathGL is a library for making scientific graphics. It provides data @@ -146,29 +136,16 @@ %package -n %{libname}-glut%{libversion} Summary: MathGL window library -Group: System/Libraries %description -n %{libname}-glut%{libversion} 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 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 -Group: System/Libraries -%if 0%{?suse_version} >= 1330 Provides: %{libname}-qt4-%{libversion} = %{version} Obsoletes: %{libname}-qt4-%{libversion} < %{version} -%endif %description -n %{libname}-qt5-%{libversion} MathGL is a library for making scientific graphics. It provides data @@ -177,7 +154,6 @@ %package -n %{libname}-wnd%{libversion} Summary: MathGL window library -Group: System/Libraries %description -n %{libname}-wnd%{libversion} MathGL is a library for making scientific graphics. It provides data @@ -186,7 +162,6 @@ %package -n %{libname}-wx%{libversion} Summary: MathGL wxWidgets library -Group: System/Libraries %description -n %{libname}-wx%{libversion} MathGL is a library for making scientific graphics. It provides data @@ -195,24 +170,19 @@ %package cgi Summary: MathGL CGI binary -Group: Productivity/Scientific/Other %description cgi This package contains the MathGL binary for parsing CGI scripts. %package devel 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} -Requires: %{libname}-qt4-%{libversion} = %{version} +Requires: %{libname}-qt5-%{libversion} = %{version} Requires: %{libname}-wnd%{libversion} = %{version} Requires: %{libname}-wx%{libversion} = %{version} Requires: cmake -%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) -Requires: %{libname}-qt5-%{libversion} = %{version} -%endif %if 0%{?suse_version} Recommends: %{name}-doc %endif @@ -227,7 +197,6 @@ %package devel-static Summary: Static libraries for MathGL -Group: Development/Libraries/C and C++ Requires: mathgl-devel = %{version} %description devel-static @@ -240,7 +209,6 @@ %package doc Summary: Documentation for MathGL -Group: Documentation/HTML BuildArch: noarch %description doc @@ -252,7 +220,6 @@ %package doc-pdf Summary: Documentation for MathGL -Group: Documentation/Other BuildArch: noarch %description doc-pdf @@ -264,7 +231,6 @@ %package doc-ru Summary: Russian documentation for MathGL -Group: Documentation/Other Requires: mathgl-doc = %{version} Provides: locale(mathgl-doc:ru) BuildArch: noarch @@ -278,7 +244,6 @@ %package examples Summary: Examples for %{name} library -Group: Productivity/Scientific/Other %description examples MathGL is a library for making scientific graphics. It provides data @@ -289,7 +254,6 @@ %package fonts Summary: Fonts for the MathGL library -Group: System/X11/Fonts BuildArch: noarch %description fonts @@ -297,7 +261,6 @@ %package lua Summary: Lua interface for the MathGL library -Group: Productivity/Scientific/Other %description lua MathGL is a library for making scientific graphics. It provides data @@ -306,10 +269,9 @@ This package provides lua interface for MathGL. -%if 0%{?enable_octave} +%if %{with octave} %package -n octave-mathgl Summary: Octave interface for the MathGL library -Group: Productivity/Scientific/Other Requires: octave-cli %description -n octave-mathgl @@ -322,7 +284,6 @@ %package -n python-mathgl Summary: Libraries and header files for the MathGL library -Group: Productivity/Scientific/Other Requires: python-base %description -n python-mathgl @@ -334,7 +295,6 @@ %package tex Summary: MathGL scripts for LaTeX documents -Group: Productivity/Publishing/TeX/Base Requires: mathgl-tools >= %{version} Requires(post): coreutils Requires(posttrans): texlive @@ -354,9 +314,8 @@ %package tex-doc Summary: Documentation for mglTeX -Group: Productivity/Publishing/TeX/Base -BuildArch: noarch Conflicts: texlive-mgltex-doc +BuildArch: noarch %description tex-doc MathGL is a library for making scientific graphics. It provides data @@ -367,14 +326,12 @@ %package tools Summary: Command line tools for the MathGL library -Group: Productivity/Scientific/Other %description tools 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 a program for data array visualization using the MathGL @@ -410,6 +367,7 @@ source %{_libdir}/mpi/gcc/openmpi%{omp_ver}/bin/mpivars.sh fi +# cmake macros don't work cmake \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DMathGL_INSTALL_LIB_DIR:PATH=%{_lib} \ @@ -433,37 +391,23 @@ -Denable-glut=on \ -Denable-fltk=on \ -Denable-wx=on \ - %if 0%{?suse_version} < 1330 - -Denable-qt4=on \ - %endif - %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) -Denable-qt5=on \ - %endif - -Denable-python=on \ + -Denable-python=%{?with_python:on}%{!?with_python:off} \ -Denable-lua=on \ - %if 0%{?enable_octave} - -Denable-octave=on \ - %else - -Denable-octave=off \ - %endif + -Denable-octave=%{?with_octave:on}%{!?with_octave:off} \ -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 \ - %else - -Denable-doc-html=off \ - -Denable-doc-pdf-en=off \ - %endif . -make %{?_smp_mflags} +%make_build %install %make_install -%if 0%{?enable_octave} +%if %{with octave} export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} # # Install octave-mathgl mkdir -p %{buildroot}%{_libdir}/octave/packages @@ -475,9 +419,7 @@ %endif # Install docs -%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/ @@ -508,23 +450,14 @@ %postun -n %{libname}-fltk%{libversion} -p /sbin/ldconfig %post -n %{libname}-glut%{libversion} -p /sbin/ldconfig %postun -n %{libname}-glut%{libversion} -p /sbin/ldconfig - -%if 0%{?suse_version} < 1330 -%post -n %{libname}-qt4-%{libversion} -p /sbin/ldconfig -%postun -n %{libname}-qt4-%{libversion} -p /sbin/ldconfig -%endif - -%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) %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 %postun -n %{libname}-wnd%{libversion} -p /sbin/ldconfig %post -n %{libname}-wx%{libversion} -p /sbin/ldconfig %postun -n %{libname}-wx%{libversion} -p /sbin/ldconfig -%if 0%{?enable_octave} +%if %{with octave} %post -n octave-mathgl octave -qf %{octave_args} --eval "pkg rebuild -auto mathgl" @@ -553,51 +486,33 @@ rm -f %{_localstatedir}/run/texlive/run-update %files -n %{libname}%{libversion} -%defattr(-,root,root) %{_libdir}/libmgl.so.%{somajor}* %files -n %{libname}-mpi%{libversion} -%defattr(-,root,root) %{_libdir}/libmgl-mpi.so.%{somajor}* %files -n %{libname}-fltk%{libversion} -%defattr(-,root,root) %{_libdir}/libmgl-fltk.so.%{somajor}* %files -n %{libname}-glut%{libversion} -%defattr(-,root,root) %{_libdir}/libmgl-glut.so.%{somajor}* -%if 0%{?suse_version} < 1330 -%files -n %{libname}-qt4-%{libversion} -%defattr(-,root,root) -%{_libdir}/libmgl-qt4.so.%{somajor}* -%endif - -%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) %files -n %{libname}-qt5-%{libversion} -%defattr(-,root,root) %{_libdir}/libmgl-qt5.so.%{somajor}* -%endif %files -n %{libname}-wnd%{libversion} -%defattr(-,root,root) %{_libdir}/libmgl-wnd.so.%{somajor}* %files -n %{libname}-wx%{libversion} -%defattr(-,root,root) %{_libdir}/libmgl-wx.so.%{somajor}* %files cgi -%defattr(-,root,root) /srv/www/cgi-bin/mgl.cgi -%if 0%{?suse_version} > 1320 -%{_mandir}/man1/mgl.cgi.1%{ext_man} -%endif +%{_mandir}/man1/mgl.cgi.1%{?ext_man} %files devel -%defattr(-,root,root) -%doc AUTHORS ChangeLog.txt README COPYING +%license COPYING +%doc AUTHORS ChangeLog.txt README %{_includedir}/mgl2/ %{_libdir}/libmgl*.so %dir %{_libdir}/cmake/mathgl @@ -608,12 +523,9 @@ %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 %doc %{_docdir}/mathgl/png/ %doc %{_docdir}/mathgl/udav/ @@ -625,69 +537,55 @@ # %%{_infodir}/%%{name}_en.info*.gz %files doc-pdf -%defattr(-,root,root) %doc %{_docdir}/mathgl/*.pdf %files doc-ru -%defattr(-,root,root) %doc %{_docdir}/mathgl/mathgl_ru.html %doc %{_docdir}/mathgl/mgl_ru.html -%endif %files examples -%defattr(-,root,root) %{_bindir}/mgl*example %files fonts -%defattr(-,root,root) %dir %{_datadir}/%{name} %{_datadir}/%{name}/fonts/ %files lua -%defattr(-,root,root) %{_libdir}/mgl-lua.so -%if 0%{?enable_octave} +%if %{with octave} %files -n octave-mathgl -%defattr(-,root,root) %{_datadir}/octave/packages/%{name}-%{oct_version}/ %{_libdir}/octave/packages/%{name}-%{oct_version}/ %endif +%if %{with python} %files -n python-mathgl -%defattr(-,root,root) -%{python_sitearch}/* +%{python2_sitearch}/* +%endif %files tex -%defattr(-,root,root) %{_datadir}/texmf/tex/latex/mgltex/ %{_localstatedir}/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 %{_bindir}/mglview %{_bindir}/mgltask -%if 0%{?suse_version} > 1320 -%{_mandir}/man1/mglconv.1%{ext_man} -%{_mandir}/man1/mglview.1%{ext_man} -%{_mandir}/man5/mgl.5%{ext_man} -%endif +%{_mandir}/man1/mglconv.1%{?ext_man} +%{_mandir}/man1/mglview.1%{?ext_man} +%{_mandir}/man5/mgl.5%{?ext_man} %files -n udav -%defattr(-,root,root) %{_bindir}/udav %{_datadir}/pixmaps/udav.png %{_datadir}/applications/udav.desktop %{_datadir}/mime/packages/mgl.xml %{_datadir}/udav/ -%if 0%{?suse_version} > 1320 -%{_mandir}/man1/udav.1%{ext_man} -%endif +%{_mandir}/man1/udav.1%{?ext_man} # 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 ++++++ mathgl-2.4.3.tar.gz -> mathgl-2.4.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/mathgl/mathgl-2.4.3.tar.gz /work/SRC/openSUSE:Factory/.mathgl.new.3592/mathgl-2.4.4.tar.gz differ: char 5, line 1
