Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2017-12-14 11:02:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mathgl (Old) and /work/SRC/openSUSE:Factory/.mathgl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mathgl" Thu Dec 14 11:02:01 2017 rev:42 rq:556617 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes 2017-11-03 16:25:07.967593575 +0100 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2017-12-14 11:02:06.534216769 +0100 @@ -1,0 +2,8 @@ +Sat Dec 9 19:13:26 UTC 2017 - [email protected] + +- Do not build with Qt4 on TW/15 as Qt WebKit 4 is not available + (boo#1072033) +- Explicitly disable marking either Qt version as "qt" plugin: + * mathgl-no-default-qt.patch + +------------------------------------------------------------------- New: ---- mathgl-no-default-qt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.uZxs6Z/_old 2017-12-14 11:02:09.206087786 +0100 +++ /var/tmp/diff_new_pack.uZxs6Z/_new 2017-12-14 11:02:09.218087206 +0100 @@ -48,6 +48,8 @@ Patch5: mathgl-texmf-dir.patch # PATCH-FIX-UPSTREAM mathgl-fltk-includedir.patch [email protected] -- Fix inclusion of fltk headers Patch6: mathgl-fltk-includedir.patch +# PATCH-FIX-OPENSUSE mathgl-no-default-qt.patch -- do not set a default qt +Patch7: mathgl-no-default-qt.patch BuildRequires: cmake >= 2.8.12 BuildRequires: desktop-file-utils BuildRequires: fltk-devel @@ -56,11 +58,9 @@ BuildRequires: giflib-devel BuildRequires: gsl-devel BuildRequires: hdf5-devel -BuildRequires: libQtWebKit-devel BuildRequires: libharu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libqt4-devel >= 4.8 BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: lua51-devel @@ -72,6 +72,10 @@ 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 @@ -156,6 +160,10 @@ %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 @@ -379,6 +387,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Correct octave-mathgl version sed -i 's/2.0/%{oct_version}/' lang/DESCRIPTION @@ -418,7 +427,9 @@ -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 @@ -491,8 +502,11 @@ %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 @@ -548,9 +562,11 @@ %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} ++++++ mathgl-no-default-qt.patch ++++++ From: Fabian Vogt <[email protected]> Subject: Do not mark a Qt version as default if it's the only one built We do not package the plain "qt" plugin, as it's just a copy of either "qt4" or "qt5". It's not possible to do this with a cmake invocation, as the deleted lines override it otherwise. Index: mathgl-2.4.1/CMakeLists.txt =================================================================== --- mathgl-2.4.1.orig/CMakeLists.txt +++ mathgl-2.4.1/CMakeLists.txt @@ -215,12 +215,6 @@ if(enable-qt4 OR enable-qt5) if(enable-qt4asqt AND enable-qt5asqt) message(SEND_ERROR "You cannot make Qt4 and Qt5 as qt at the same time.") endif(enable-qt4asqt AND enable-qt5asqt) - if(enable-qt4 AND NOT enable-qt5) - set(enable-qt4asqt TRUE) - endif(enable-qt4 AND NOT enable-qt5) - if(enable-qt5 AND NOT enable-qt4) - set(enable-qt5asqt TRUE) - endif(enable-qt5 AND NOT enable-qt4) # if(NOT enable-opengl) # message(SEND_ERROR "You cannot build MathGL with Qt4 or Qt5 without OpenGL enabled.") # endif(NOT enable-opengl)
