Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at 2015-05-02 21:38:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tulip (Old) and /work/SRC/openSUSE:Factory/.tulip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tulip" Changes: -------- --- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2015-02-03 11:40:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2015-05-02 21:38:36.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 29 19:07:35 UTC 2015 - [email protected] + +- Build against QT5 in Factory. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.nqvR9J/_old 2015-05-02 21:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.nqvR9J/_new 2015-05-02 21:38:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tulip # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -54,10 +54,8 @@ BuildRequires: ftgl-devel BuildRequires: glew-devel BuildRequires: graphviz -BuildRequires: libQtWebKit-devel BuildRequires: libdrm-devel BuildRequires: libjpeg-devel -BuildRequires: libqt4-devel BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: python-Sphinx @@ -68,8 +66,6 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel %if 0%{?suse_version} > 1130 -BuildRequires: python-qt4-devel -BuildRequires: qt4-assistant-adp-devel BuildRequires: pkgconfig(glu) %endif %if 0%{?suse_version} > 1110 @@ -77,6 +73,21 @@ %else BuildRequires: gle %endif +%if 0%{?suse_version} > 1320 +BuildRequires: python-qt5-devel +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt5XmlPatterns) +%else +BuildRequires: libQtWebKit-devel +BuildRequires: libqt4-devel +BuildRequires: python-qt4-devel +BuildRequires: qt4-assistant-adp-devel +%endif %description Tulip software is a system dedicated to the visualization of huge @@ -213,6 +224,9 @@ export LIBBFD_SO_PATH=`ls /usr/lib*/libbfd*.so` export LIBBFD_SO_NAME=`basename $LIBBFD_SO_PATH .so` %{cmake} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=TRUE \ +%if 0%{?suse_version} > 1320 + -DUSE_QT5=yes -DUSE_QT5_IF_INSTALLED=yes \ +%endif -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing -Wall -O2 -g" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated -Wall -O2 -g" \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1 -DSYSTEM_FTGL=1 \
