Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2016-10-23 12:53:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-08-12 15:42:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2016-10-23 12:53:57.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Oct 15 13:33:50 UTC 2016 - [email protected] + +- Update to version 2.3.5.1: + + Library libmgl-qt is removed. You need to use libmgl-qt4 or + libmgl-qt5 explicitly now. + + Compatibility changes for latest MS VisualStudio. + + Bugfixes. +- Changes from version 2.3.5: + + See Changelog.txt for list of changes. +- Rebase mathgl-examples-install.patch for updated version. +- Define a macro for deciding whether to enable octave bindings, + but disable octave bindings for all openSUSE versions for now + as mathgl fails to build with updated octave. This is a + temporary workaround, and once the build issue is fixed, we + should revert back to enabling octave for recent openSUSE + versions. The "enable_octave" macro is defined with this in + mind. +- Add rpmlintrc file to suppress warning of missing man pages for + the example binaries. These just clutter up the rpmlint log and + have no practical use. + +------------------------------------------------------------------- Old: ---- mathgl-2.3.4.tar.gz New: ---- mathgl-2.3.5.1.tar.gz mathgl-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.RHkGia/_old 2016-10-23 12:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.RHkGia/_new 2016-10-23 12:54:00.000000000 +0200 @@ -17,20 +17,25 @@ %define octave_args --no-window-system --norc - -Name: mathgl %define libname libmgl -Version: 2.3.4 -Release: 0 # oct_version must be x.y.z %define oct_version %{version} -%define somajor 7.4.1 -%define libversion 7_4_1 +%define somajor 7.4.3 +%define libversion 7_4_3 +%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 +Release: 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 +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 Patch1: mathgl-fix-python-module-path.patch # PATCH-FEATURE-UPSTREAM mathgl-examples-install.patch -- Enable examples install @@ -56,17 +61,9 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libqt4-devel >= 4.8 -%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) -BuildRequires: libQt5WebKit5-devel -BuildRequires: libQt5WebKitWidgets-devel -BuildRequires: libqt5-qtbase-devel -%endif BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: lua51-devel -%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) -BuildRequires: octave-devel -%endif BuildRequires: openmpi-devel BuildRequires: python-devel BuildRequires: python-numpy-devel @@ -75,22 +72,28 @@ BuildRequires: texlive-filesystem BuildRequires: texlive-latex %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) +BuildRequires: libQt5WebKit5-devel +BuildRequires: libQt5WebKitWidgets-devel +BuildRequires: libqt5-qtbase-devel +%endif +%if 0%{?enable_octave} +BuildRequires: octave-devel +%endif +%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) BuildRequires: wxWidgets-devel >= 3 %else -BuildRequires: wxWidgets-devel %define _use_internal_dependency_generator 0 -%define __find_requires %wx_requires +%define __find_requires %{wx_requires} +BuildRequires: wxWidgets-devel %endif - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %if 0%{?fedora_version} +%define _defaultdocdir %{_datadir}/doc/packages BuildRequires: fltk-fluid BuildRequires: libXmu-devel BuildRequires: texi2html BuildRequires: texinfo-tex -%define _defaultdocdir %{_datadir}/doc/packages %endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description MathGL is a cross-platform library for making high-quality scientific @@ -206,12 +209,12 @@ Requires: %{libname}-fltk%{libversion} = %{version} Requires: %{libname}-glut%{libversion} = %{version} Requires: %{libname}-qt4-%{libversion} = %{version} -%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) -Requires: %{libname}-qt5-%{libversion} = %{version} -%endif 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 @@ -272,8 +275,8 @@ %package doc-ru Summary: Russian documentation for MathGL Group: Documentation/Other -Provides: locale(mathgl-doc:ru) Requires: mathgl-doc = %{version} +Provides: locale(mathgl-doc:ru) BuildArch: noarch %description doc-ru @@ -319,7 +322,7 @@ This package provides lua interface for MathGL. -%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) +%if 0%{?enable_octave} %package -n octave-mathgl Summary: Octave interface for MathGL library Group: Productivity/Scientific/Other @@ -352,15 +355,15 @@ %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(posttrans): texlive Requires(postun): coreutils Requires(postun): texlive -Requires(posttrans): texlive +Requires(pre): texlive +Recommends: mathgl-tex-doc = %{version} +Provides: tex(mgltex.sty) +BuildArch: noarch %description tex MathGL is a cross-platform library for making high-quality scientific @@ -425,6 +428,7 @@ sed -i 's/\r$//' AUTHORS README %build +# FIXME: you should use %%cmake macros cmake \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DMGL_LIB_INSTALL_DIR:PATH=%{_lib} \ @@ -453,7 +457,7 @@ %endif -Denable-python=on \ -Denable-lua=on \ - %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) + %if 0%{?enable_octave} -Denable-octave=on \ %else -Denable-octave=off \ @@ -473,7 +477,7 @@ %install %make_install -%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) +%if 0%{?enable_octave} export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} # # Install octave-mathgl mkdir -p %{buildroot}%{_libdir}/octave/packages @@ -492,14 +496,10 @@ install -d %{buildroot}/srv/www/cgi-bin/ mv %{buildroot}%{_datadir}/%{name}/mgl.cgi %{buildroot}/srv/www/cgi-bin/mgl.cgi -# Qt libraries -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 +mkdir -p %{buildroot}%{_localstatedir}/adm/update-scripts ln -sf %{_datadir}/texmf/texconfig/zypper.py \ - %{buildroot}/var/adm/update-scripts/texlive-mgltex-%{version}-%{release}-zypper + %{buildroot}%{_localstatedir}/adm/update-scripts/texlive-mgltex-%{version}-%{release}-zypper # %%post doc # %%install_info --info-dir=%%{_infodir} %%{_infodir}/%%{name}_en.info.gz @@ -512,40 +512,27 @@ # %%install_info_delete --info-dir=%%_infodir %%{_infodir}/%%{name}_en.info-2.gz %post -n %{libname}%{libversion} -p /sbin/ldconfig - %postun -n %{libname}%{libversion} -p /sbin/ldconfig - %post -n %{libname}-mpi%{libversion} -p /sbin/ldconfig - %postun -n %{libname}-mpi%{libversion} -p /sbin/ldconfig - %post -n %{libname}-fltk%{libversion} -p /sbin/ldconfig - %postun -n %{libname}-fltk%{libversion} -p /sbin/ldconfig - %post -n %{libname}-glut%{libversion} -p /sbin/ldconfig - %postun -n %{libname}-glut%{libversion} -p /sbin/ldconfig - %post -n %{libname}-qt4-%{libversion} -p /sbin/ldconfig - %postun -n %{libname}-qt4-%{libversion} -p /sbin/ldconfig %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%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) +%if 0%{?enable_octave} %post -n octave-mathgl octave -qf %{octave_args} --eval "pkg rebuild -auto mathgl" @@ -554,24 +541,24 @@ %endif %post tex -mkdir -p /var/run/texlive -> /var/run/texlive/run-mktexlsr -> /var/run/texlive/run-update +mkdir -p %{_localstatedir}/run/texlive +> %{_localstatedir}/run/texlive/run-mktexlsr +> %{_localstatedir}/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 +mkdir -p %{_localstatedir}/run/texlive +> %{_localstatedir}/run/texlive/run-mktexlsr +> %{_localstatedir}/run/texlive/run-update %posttrans tex -test -f /var/run/texlive/run-update || exit 0 +test -f %{_localstatedir}/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 +rm -f %{_localstatedir}/run/texlive/run-update %files -n %{libname}%{libversion} %defattr(-,root,root) @@ -591,7 +578,6 @@ %files -n %{libname}-qt4-%{libversion} %defattr(-,root,root) -%{_libdir}/libmgl-qt.so.%{somajor}* %{_libdir}/libmgl-qt4.so.%{somajor}* %if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) @@ -611,7 +597,7 @@ %files cgi %defattr(-,root,root) /srv/www/cgi-bin/mgl.cgi -%{_mandir}/man1/mgl.cgi.1.gz +%{_mandir}/man1/mgl.cgi.1%{ext_man} %files devel %defattr(-,root,root) @@ -661,7 +647,7 @@ %defattr(-,root,root) %{_libdir}/mgl-lua.so -%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 ) +%if 0%{?enable_octave} %files -n octave-mathgl %defattr(-,root,root) %{_datadir}/octave/packages/%{name}-%{oct_version}/ @@ -675,7 +661,7 @@ %files tex %defattr(-,root,root) %{_datadir}/texmf/tex/latex/mgltex/ -/var/adm/update-scripts/texlive-mgltex-%{version}-%{release}-zypper +%{_localstatedir}/adm/update-scripts/texlive-mgltex-%{version}-%{release}-zypper %files tex-doc %defattr(-,root,root) @@ -685,9 +671,9 @@ %defattr(-,root,root) %{_bindir}/mglconv %{_bindir}/mglview -%{_mandir}/man1/mglconv.1.gz -%{_mandir}/man1/mglview.1.gz -%{_mandir}/man5/mgl.5.gz +%{_mandir}/man1/mglconv.1%{ext_man} +%{_mandir}/man1/mglview.1%{ext_man} +%{_mandir}/man5/mgl.5%{ext_man} %files -n udav %defattr(-,root,root) @@ -696,6 +682,6 @@ %{_datadir}/applications/udav.desktop %{_datadir}/mime/packages/mgl.xml %{_datadir}/udav/ -%{_mandir}/man1/udav.1.gz +%{_mandir}/man1/udav.1%{ext_man} %changelog ++++++ mathgl-2.3.4.tar.gz -> mathgl-2.3.5.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/mathgl/mathgl-2.3.4.tar.gz /work/SRC/openSUSE:Factory/.mathgl.new/mathgl-2.3.5.1.tar.gz differ: char 5, line 1 ++++++ mathgl-examples-install.patch ++++++ --- /var/tmp/diff_new_pack.RHkGia/_old 2016-10-23 12:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.RHkGia/_new 2016-10-23 12:54:00.000000000 +0200 @@ -1,11 +1,10 @@ -Index: mathgl-2.3.4/examples/CMakeLists.txt +Index: mathgl-2.3.5.1/examples/CMakeLists.txt =================================================================== ---- mathgl-2.3.4.orig/examples/CMakeLists.txt -+++ mathgl-2.3.4/examples/CMakeLists.txt -@@ -4,22 +4,38 @@ endif(MGL_HAVE_GSL) - +--- mathgl-2.3.5.1.orig/examples/CMakeLists.txt ++++ mathgl-2.3.5.1/examples/CMakeLists.txt +@@ -1,21 +1,37 @@ add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) - target_link_libraries(mgl_example mgl) + target_link_libraries(mgl_example mgl-static ${getopt_lib-static}) +install( + TARGETS mgl_example + RUNTIME DESTINATION bin @@ -41,7 +40,7 @@ endif(MGL_HAVE_WX) if(QT_ENABLED) -@@ -27,17 +43,33 @@ if(QT_ENABLED) +@@ -23,17 +39,33 @@ if(QT_ENABLED) if(enable-qt5) include(../cmake-qt5.txt) target_link_libraries(mgl_qt_example mgl-qt5) @@ -57,21 +56,21 @@ + RUNTIME DESTINATION bin + ) endif(enable-qt5) - add_executable(mgl_qgl_example wnd_samples.cpp qgl_example.cpp) - if(enable-qt5) - target_link_libraries(mgl_qgl_example mgl) - qt5_use_modules(mgl_qgl_example ${MGL_QT5_LIBS}) -+ install( -+ TARGETS mgl_qgl_example -+ RUNTIME DESTINATION bin -+ ) - else(enable-qt5) - target_link_libraries(mgl_qgl_example mgl) - qt4_use_modules(mgl_qgl_example ${MGL_QT4_LIBS}) -+ install( -+ TARGETS mgl_qgl_example -+ RUNTIME DESTINATION bin -+ ) - endif(enable-qt5) - + + if(MGL_HAVE_OPENGL) + add_executable(mgl_qgl_example wnd_samples.cpp qgl_example.cpp) + if(enable-qt5) + target_link_libraries(mgl_qgl_example mgl ${MGL_QT5_LIBS}) ++ install( ++ TARGETS mgl_qgl_example ++ RUNTIME DESTINATION bin ++ ) + else(enable-qt5) + target_link_libraries(mgl_qgl_example mgl ${MGL_QT4_LIBS}) ++ install( ++ TARGETS mgl_qgl_example ++ RUNTIME DESTINATION bin ++ ) + endif(enable-qt5) + endif(MGL_HAVE_OPENGL) endif(QT_ENABLED) ++++++ mathgl-oldtexinfo.patch ++++++ --- /var/tmp/diff_new_pack.RHkGia/_old 2016-10-23 12:54:00.000000000 +0200 +++ /var/tmp/diff_new_pack.RHkGia/_new 2016-10-23 12:54:00.000000000 +0200 @@ -1,8 +1,8 @@ -Index: mathgl-2.3.3/texinfo/CMakeLists.txt +Index: mathgl-2.3.5.1/texinfo/CMakeLists.txt =================================================================== ---- mathgl-2.3.3.orig/texinfo/CMakeLists.txt -+++ mathgl-2.3.3/texinfo/CMakeLists.txt -@@ -93,7 +93,7 @@ add_custom_command(OUTPUT ${MGL_OUT}/mat +--- mathgl-2.3.5.1.orig/texinfo/CMakeLists.txt ++++ mathgl-2.3.5.1/texinfo/CMakeLists.txt +@@ -96,7 +96,7 @@ add_custom_command(OUTPUT ${MGL_OUT}/mat WORKING_DIRECTORY ${MGL_OUT} ) add_custom_command(OUTPUT ${MGL_OUT}/mgl_en.html @@ -11,7 +11,7 @@ DEPENDS ${list_texi_files_en} mgl_en.texi ${MGL_PNG_N} WORKING_DIRECTORY ${MGL_OUT} ) -@@ -103,7 +103,7 @@ add_custom_command(OUTPUT ${MGL_OUT}/mat +@@ -106,7 +106,7 @@ add_custom_command(OUTPUT ${MGL_OUT}/mat WORKING_DIRECTORY ${MGL_OUT} ) add_custom_command(OUTPUT ${MGL_OUT}/mgl_ru.html ++++++ mathgl-rpmlintrc ++++++ # Example binaries not accompanied by man pages addFilter("mathgl-examples.* no-manual-page-for-binary")
