Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at 2016-01-21 23:43:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-12 10:02:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2016-01-22 01:09:00.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Jan 11 08:37:00 UTC 2016 - kkae...@suse.com + +- Update to 4.8.0 + This release offers some new features, mainly : + - new layout plugins coming from the newly integrated OGDF v2015.05 + - an improved version of the Color mapping plugin with predefined + color schemes added from ColorBrewer.org + - a compressed format for the TLPB import/export plugins + + It adds some improvements in : + - the computation performance of K-Core and Louvain clustering measures + - the graphical user interface of the Self Organizing map dedicated view + + Many bugs have been also fixed especially in : + - the Python dedicated view and IDE + - the Edge bundling plugin + - the Scatter plot, Histogram and Pixel oriented dedicated views + +- drop 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch + (upstream) + +------------------------------------------------------------------- Old: ---- 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch tulip-4.7.0_src.tar.gz New: ---- tulip-4.8.0_src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tulip # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,11 +20,11 @@ Summary: Visualization of huge graphs License: GPL-2.0+ Group: Productivity/Graphics/Visualization/Graph -Version: 4.7.0 +# .so version +%define tulip_version 4.8 +Version: %{tulip_version}.0 Release: 0 Url: http://www.tulip-software.org/ -# .so version -%define tulip_version 4.7 Source: %{name}-%{version}_src.tar.gz Source1: %{name}.desktop Source4: %{name}-rpmlintrc @@ -40,7 +40,6 @@ # Fix FindFTGL.cmake Patch6: 0006-Find-system-ftgl.patch # FIX-UPSTREAM (upstream commit r10874) -Patch7: 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch Patch8: use-libbfd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -175,7 +174,7 @@ Group: Productivity/Graphics/Visualization/Graph %description -n libtulip -See package 'tulip' for details. +A library for handling large graphs. See package 'tulip' for details. %package ogdf Summary: A library for displaying graph in a GL context @@ -183,7 +182,7 @@ Requires: Mesa %description ogdf -See package 'tulip' for details. +A library for displaying graph in a GL context. See package 'tulip' for details. %package python Summary: Python bindings for tulip @@ -202,10 +201,10 @@ Requires: Mesa %description -n libtulip-ogl -See package 'tulip' for details. +A library for displaying graph in a GL context. See package 'tulip' for details. %prep -%setup -q -n %{name} +%setup -q dos2unix CMakeLists.txt %patch1 -p1 # not yet %patch2 -p1 @@ -213,7 +212,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %build @@ -252,7 +250,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-user/html/.buildinfo rm -f $RPM_BUILD_ROOT/%{_datadir}/tulip/doc/tulip-python/html/.buildinfo -%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip/doc +%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip %fdupes $RPM_BUILD_ROOT%{_docdir}/tulip %fdupes $RPM_BUILD_ROOT%{_includedir}/tulip @@ -264,6 +262,18 @@ %postun -n libtulip-ogl -p /sbin/ldconfig +%post ogdf -p /sbin/ldconfig + +%postun ogdf -p /sbin/ldconfig + +%post python -p /sbin/ldconfig + +%postun python -p /sbin/ldconfig + +%post devel -p /sbin/ldconfig + +%postun devel -p /sbin/ldconfig + %files %defattr(-,root,root) %{_bindir}/tulip @@ -283,8 +293,19 @@ %files python %defattr(-,root,root) %{_libdir}/libtulip-python-%{tulip_version}.so -%{python_sitearch}/*.so -%{python_sitearch}/*.py* +%dir %{python_sitearch}/tulip +%dir %{python_sitearch}/tulip/native +%dir %{python_sitearch}/tulipgui +%dir %{python_sitearch}/tulipgui/native +%dir %{python_sitearch}/tulipogl +%dir %{python_sitearch}/tulipogl/native +%{python_sitearch}/tulip/native/*.so +%{python_sitearch}/tulip/*.py* +%{python_sitearch}/tulipgui/native/*.so +%{python_sitearch}/tulipgui/*.py* +%{python_sitearch}/tulipogl/native/*.so +%{python_sitearch}/tulipogl/*.py* +%{python_sitearch}/tulipplugins.py* %dir %{_datadir}/tulip/apiFiles %{_datadir}/tulip/apiFiles/* ++++++ 0001-Install-to-lib64.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 5322882d51bdf94ce0558320e956e926feccfa9f Mon Sep 17 00:00:00 2001 +From 07873ab7e6904e1c9ed21b260a1b91c4442318b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Tue, 11 Nov 2014 09:51:21 +0100 Subject: [PATCH 1/6] Install to lib64 @@ -8,10 +8,10 @@ 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c493239d1cfa..3ed6f49567f2 100644 +index 8f4af01a80b9..60e795702b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -387,7 +387,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) +@@ -520,7 +520,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include) ## ======================================================== ## Install paths ## ======================================================== @@ -26,5 +26,5 @@ SET(TulipGlyphPluginsInstallDir ${TulipPluginsInstallDir}/glyph/) SET(TulipViewPluginsInstallDir ${TulipPluginsInstallDir}/view/) -- -2.1.4 +2.6.4 ++++++ 0002-Enable-tlprender.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 0749491e172afae66aa9d209ddcbdae1c80b2d8e Mon Sep 17 00:00:00 2001 +From efa26e169d37c61262bb3d495829a1948b38dc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Tue, 11 Nov 2014 09:52:57 +0100 Subject: [PATCH 2/6] Enable tlprender @@ -17,5 +17,5 @@ ENDIF(APPLE) +ADD_SUBDIRECTORY(tlprender) -- -2.1.4 +2.6.4 ++++++ 0003-Enable-PPC-and-PPC64.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 51037fee41d564fd20eb64ba9556f69a0c381450 Mon Sep 17 00:00:00 2001 +From d60ad852f5bee564d95a3effae2f9ade1d2afd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Tue, 11 Nov 2014 09:56:52 +0100 Subject: [PATCH 3/6] Enable PPC and PPC64 @@ -23,5 +23,5 @@ #define OS_ARCHITECTURE "other" #endif -- -2.1.4 +2.6.4 ++++++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 087e4bdbdbddb3d3be72c13fdf30375cb378f526 Mon Sep 17 00:00:00 2001 +From 9d7722acd89c08b695a6d674906490c05dfd0fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Tue, 11 Nov 2014 10:03:05 +0100 Subject: [PATCH 4/6] Include string.h for libpng16 in GlTextureManager.cpp @@ -20,5 +20,5 @@ #include <tulip/GlTextureManager.h> -- -2.1.4 +2.6.4 ++++++ 0005-Use-system-ftgl-lib-if-available.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,48 +1,49 @@ -From 2c50bea125f608970371d879e084d25232736bf0 Mon Sep 17 00:00:00 2001 +From e07efca6e14eacf4de651b8a4e5333a44c0bb5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Tue, 11 Nov 2014 10:15:54 +0100 Subject: [PATCH 5/6] Use system ftgl lib if available --- CMakeLists.txt | 10 ++++++++-- - thirdparty/CMakeLists.txt | 2 ++ - 2 files changed, 10 insertions(+), 2 deletions(-) + thirdparty/CMakeLists.txt | 4 +++- + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ed6f49567f2..248ef79f3f97 100644 +index 60e795702b5f..75123c7f8424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -363,8 +363,14 @@ endif(QUAZIP_FOUND) +@@ -495,8 +495,14 @@ IF(NOT BUILD_CORE_ONLY) - SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) - SET(QxtLibrary qxt-tulip-${TulipMMVersion}) --SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) --SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) -+IF(SYSTEM_FTGL) -+ FIND_PACKAGE(FTGL) -+ SET(FTGLInclude ${FTGL_INCLUDE_DIR}) -+ SET(FTGLLibrary ${FTGL_LIBRARIES}) -+ELSE() -+ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) -+ SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) -+ENDIF() + SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src) + SET(QxtLibrary qxt-tulip-${TulipMMVersion}) +- SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) +- SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) ++ IF(SYSTEM_FTGL) ++ FIND_PACKAGE(FTGL) ++ SET(FTGLInclude ${FTGL_INCLUDE_DIR}) ++ SET(FTGLLibrary ${FTGL_LIBRARIES}) ++ ELSE() ++ SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) ++ SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) ++ ENDIF() + SET(Tess2Include ${PROJECT_SOURCE_DIR}/thirdparty/libtess2/Include) + SET(Tess2Library tess2-tulip-${TulipMMVersion}) ENDIF(NOT BUILD_CORE_ONLY) - - SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 49dd579a1780..3161df543454 100644 +index 50c05a73346a..8f1675327b13 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt -@@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(libqhull) +@@ -7,7 +7,9 @@ ADD_SUBDIRECTORY(OGDF) + ADD_SUBDIRECTORY(libqhull) ADD_SUBDIRECTORY(yajl) - IF(NOT BUILD_CORE_ONLY) +-ADD_SUBDIRECTORY(ftgl) +IF(NOT SYSTEM_FTGL) - ADD_SUBDIRECTORY(ftgl) ++ ADD_SUBDIRECTORY(ftgl) +ENDIF(NOT SYSTEM_FTGL) + ADD_SUBDIRECTORY(libtess2) IF(NOT QUAZIP_FOUND) ADD_SUBDIRECTORY(quazip) - ENDIF(NOT QUAZIP_FOUND) -- -2.1.4 +2.6.4 ++++++ 0006-Find-system-ftgl.patch ++++++ --- /var/tmp/diff_new_pack.6jG4O4/_old 2016-01-22 01:09:09.000000000 +0100 +++ /var/tmp/diff_new_pack.6jG4O4/_new 2016-01-22 01:09:09.000000000 +0100 @@ -1,4 +1,4 @@ -From 90e5d27d3e4f1215faa12a7b318f8fdf4f94f178 Mon Sep 17 00:00:00 2001 +From 0c5415a5b819536fd4e8e20fc65fa0122d08b101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Tue, 11 Nov 2014 11:04:20 +0100 Subject: [PATCH 6/6] Find system ftgl @@ -39,5 +39,5 @@ /usr/X11/lib /usr/X11R6/lib -- -2.1.4 +2.6.4 ++++++ tulip-4.7.0_src.tar.gz -> tulip-4.8.0_src.tar.gz ++++++ /work/SRC/openSUSE:Factory/tulip/tulip-4.7.0_src.tar.gz /work/SRC/openSUSE:Factory/.tulip.new/tulip-4.8.0_src.tar.gz differ: char 5, line 1