• Files Changed
• Browse Source

+BuildRequires:  python-sip >= 4.16.7

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

drop unneeded patch

• Files Changed
• Browse Source

add (Build)Requires

• Files Changed
• Browse Source

add libtess2 to lib pkg

• Files Changed
• Browse Source

- Update to 4.9.0
  This is essentialy a maintenance release with major improvements
  in the SVG export plugin
  It adds many performance improvements in the computation of graph
  measures (Link Communities, Louvain, K-Core, MCL, Page Rank,
  Welsh and Powell) and some user interaction improvements in the
  CSV Import Wizard and the Python Script view.
  Several bugs have been also fixed especially in the :
  - Color Scale dialog,
  - Fish Eye interactor
  - Geographic and Scatter Plot dedicated views,
  - Python bindings,
  - interactive selection of graph elements,
  - Undo/Redo mechanism.

• Files Changed
• Browse Source

• Files Changed
• Browse Source

- Update to 4.8.1
  This is essentialy a maintenance release with many bug fixes and
  improvements in:
  - the OpenGL rendering engine,
  - the GUI, especially in the
    - Geographic,
    - Histogram,
    - Python Script,
    - Self Organizing Maps,
    dedicated views,
    - the Import CSV wizard,
  - several plugins such as the:
    - Bertault (OGDF) layout,
    - Fast Multipole Embedder (OGDF) layout,
    - File System import,
    - Link Communities measure,
    - Quotient Clustering algorithm,
    - TLPB import,
    - Web Site import.
- drop use-libbfd.patch (upstream)
--This line, and those below, will be ignored--

M    0001-Install-to-lib64.patch
M    0002-Enable-tlprender.patch
M    0003-Enable-PPC-and-PPC64.patch
M    0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch
M    0005-Use-system-ftgl-lib-if-available.patch
M    0006-Find-system-ftgl.patch
A    objects.inv
D    tulip-4.8.0_src.tar.gz
M    tulip.changes
M    tulip.spec
D    use-libbfd.patch

Diff for working copy: .
Index: 0001-Install-to-lib64.patch
===================================================================

--- 0001-Install-to-lib64.patch	(revision ed68ea242d881e386c9884af67209567)
+++ 0001-Install-to-lib64.patch	(working copy)
@@ -1,4 +1,4 @@
-From 07873ab7e6904e1c9ed21b260a1b91c4442318b0 Mon Sep 17 00:00:00 2001
+From 06e9b2f9e7365d161561639ffbbbfcdf27ac5d8b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@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 8f4af01a80b9..60e795702b5f 100644
+index 035b2e9281de..673f88ea1d84 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -520,7 +520,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include)
+@@ -526,7 +526,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.6.4
+2.7.2
 

Index: 0002-Enable-tlprender.patch
===================================================================

--- 0002-Enable-tlprender.patch	(revision ed68ea242d881e386c9884af67209567)
+++ 0002-Enable-tlprender.patch	(working copy)
@@ -1,4 +1,4 @@
-From efa26e169d37c61262bb3d495829a1948b38dc3a Mon Sep 17 00:00:00 2001
+From cd830177d03ef28c2f5537a0d63e4b7ef79f3b6a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@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.6.4
+2.7.2
 

Index: 0003-Enable-PPC-and-PPC64.patch
===================================================================

--- 0003-Enable-PPC-and-PPC64.patch	(revision ed68ea242d881e386c9884af67209567)
+++ 0003-Enable-PPC-and-PPC64.patch	(working copy)
@@ -1,4 +1,4 @@
-From d60ad852f5bee564d95a3effae2f9ade1d2afd6d Mon Sep 17 00:00:00 2001
+From 26e957b3c8357754b887be0ad6448efad8bbd3e3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@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.6.4
+2.7.2
 

Index: 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch
===================================================================

--- 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch	(revision ed68ea242d881e386c9884af67209567)
+++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch	(working copy)
@@ -1,4 +1,4 @@
-From 9d7722acd89c08b695a6d674906490c05dfd0fcb Mon Sep 17 00:00:00 2001
+From b8497b10266221b59e4758fb46728644550c4507 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@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.6.4
+2.7.2
 

Index: 0005-Use-system-ftgl-lib-if-available.patch
===================================================================

--- 0005-Use-system-ftgl-lib-if-available.patch	(revision ed68ea242d881e386c9884af67209567)
+++ 0005-Use-system-ftgl-lib-if-available.patch	(working copy)
@@ -1,4 +1,4 @@
-From e07efca6e14eacf4de651b8a4e5333a44c0bb5c2 Mon Sep 17 00:00:00 2001
+From 327bb0e0da951e8fe158867f3d72d87be2506610 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 10:15:54 +0100
 Subject: [PATCH 5/6] Use system ftgl lib if available
@@ -9,10 +9,10 @@
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 60e795702b5f..75123c7f8424 100644
+index 673f88ea1d84..294101e1973b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -495,8 +495,14 @@ IF(NOT BUILD_CORE_ONLY)
+@@ -501,8 +501,14 @@ IF(NOT BUILD_CORE_ONLY)
  
    SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src)
    SET(QxtLibrary qxt-tulip-${TulipMMVersion})
@@ -30,20 +30,20 @@
    SET(Tess2Library tess2-tulip-${TulipMMVersion})
  ENDIF(NOT BUILD_CORE_ONLY)
 diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 50c05a73346a..8f1675327b13 100644
+index 436db227bcfd..ad34ab881f75 100644
 --- a/thirdparty/CMakeLists.txt
 +++ b/thirdparty/CMakeLists.txt
-@@ -7,7 +7,9 @@ ADD_SUBDIRECTORY(OGDF)
+@@ -12,7 +12,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)
-+ENDIF(NOT SYSTEM_FTGL)
- ADD_SUBDIRECTORY(libtess2)
- IF(NOT QUAZIP_FOUND)
-   ADD_SUBDIRECTORY(quazip)
+-  ADD_SUBDIRECTORY(ftgl)
++  IF(NOT SYSTEM_FTGL)
++    ADD_SUBDIRECTORY(ftgl)
++  ENDIF(NOT SYSTEM_FTGL)
+   ADD_SUBDIRECTORY(libtess2)
+   IF(NOT QUAZIP_FOUND)
+     ADD_SUBDIRECTORY(quazip)
 -- 
-2.6.4
+2.7.2
 

Index: 0006-Find-system-ftgl.patch
===================================================================

--- 0006-Find-system-ftgl.patch	(revision ed68ea242d881e386c9884af67209567)
+++ 0006-Find-system-ftgl.patch	(working copy)
@@ -1,4 +1,4 @@
-From 0c5415a5b819536fd4e8e20fc65fa0122d08b101 Mon Sep 17 00:00:00 2001
+From c33670e5b1044e70c6d4fd268fbf15730b6c71a9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 11:04:20 +0100
 Subject: [PATCH 6/6] Find system ftgl
@@ -7,10 +7,10 @@
  FindFTGL.cmake | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/FindFTGL.cmake b/FindFTGL.cmake
+diff --git a/cmake/FindFTGL.cmake b/cmake/FindFTGL.cmake
 index 613c659341bf..e484cfe9cdf0 100644
---- a/FindFTGL.cmake
-+++ b/FindFTGL.cmake
+--- a/cmake/FindFTGL.cmake
++++ b/cmake/FindFTGL.cmake
 @@ -45,13 +45,13 @@
  # Once done this will define
  #
@@ -39,5 +39,5 @@
        /usr/X11/lib
        /usr/X11R6/lib
 -- 
-2.6.4
+2.7.2
 

Index: tulip.changes
===================================================================

--- tulip.changes	(revision ed68ea242d881e386c9884af67209567)
+++ tulip.changes	(working copy)
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Mar 15 10:28:15 UTC 2016 - kkaempf@suse.com
+
+- Update to 4.8.1
+  This is essentialy a maintenance release with many bug fixes and
+  improvements in:
+
+  - the OpenGL rendering engine,
+  - the GUI, especially in the
+    - Geographic,
+    - Histogram,
+    - Python Script,
+    - Self Organizing Maps,
+    dedicated views,
+    - the Import CSV wizard,
+  - several plugins such as the:
+    - Bertault (OGDF) layout,
+    - Fast Multipole Embedder (OGDF) layout,
+    - File System import,
+    - Link Communities measure,
+    - Quotient Clustering algorithm,
+    - TLPB import,
+    - Web Site import.
+
+- drop use-libbfd.patch (upstream)
+
 -------------------------------------------------------------------
 Mon Jan 11 08:37:00 UTC 2016 - kkaempf@suse.com
 

Index: tulip.spec
===================================================================

--- tulip.spec	(revision ed68ea242d881e386c9884af67209567)
+++ tulip.spec	(working copy)
@@ -22,7 +22,7 @@
 Group:          Productivity/Graphics/Visualization/Graph
 # .so version
 %define tulip_version 4.8
-Version:        %{tulip_version}.0
+Version:        %{tulip_version}.1
 Release:        0
 Url:            http://www.tulip-software.org/
 Source:         %{name}-%{version}_src.tar.gz
@@ -39,8 +39,6 @@
 Patch5:         0005-Use-system-ftgl-lib-if-available.patch
 # Fix FindFTGL.cmake
 Patch6:         0006-Find-system-ftgl.patch
-# FIX-UPSTREAM (upstream commit r10874)
-Patch8:         use-libbfd.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  Mesa-devel
@@ -212,7 +210,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch8 -p1
 
 %build
 

Index: objects.inv
===================================================================
Binary file 'objects.inv' added.

Index: tulip-4.8.0_src.tar.gz
===================================================================
Binary file 'tulip-4.8.0_src.tar.gz' deleted.

Index: use-libbfd.patch
===================================================================
--- use-libbfd.patch	(revision ed68ea242d881e386c9884af67209567)
+++ use-libbfd.patch	(working copy)
@@ -1,18 +0,0 @@
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-tulip/software/crash_handling/CMakeLists.txt ./software/crash_handling/CMakeLists.txt
---- ../orig-tulip/software/crash_handling/CMakeLists.txt	2015-01-11 22:16:08.000000000 +0100
-+++ ./software/crash_handling/CMakeLists.txt	2015-01-14 14:24:20.760963420 +0100
-@@ -41,7 +41,13 @@
- TARGET_LINK_LIBRARIES(crash_handling ${CMAKE_DL_LIBS})
- 
- IF(HAVE_BFD)
--    TARGET_LINK_LIBRARIES(crash_handling bfd)
-+  IF(LIBBFD_NAME)
-+    set(BFD_LIBRARY_NAME ${LIBBFD_NAME})
-+  ELSE(LIBBFD_NAME)
-+    set(BFD_LIBRARY_NAME bfd)
-+  ENDIF(LIBBFD_NAME)
-+  MESSAGE("Linking against bfd ${BFD_LIBRARY_NAME}")    
-+    TARGET_LINK_LIBRARIES(crash_handling ${BFD_LIBRARY_NAME})
- ENDIF(HAVE_BFD)
- 
- IF(MINGW)

• Files Changed
• Browse Source

- Update to 4.8.1
  This is essentialy a maintenance release with many bug fixes and
  improvements in:
  - the OpenGL rendering engine,
  - the GUI, especially in the
    - Geographic,
    - Histogram,
    - Python Script,
    - Self Organizing Maps,
    dedicated views,
    - the Import CSV wizard,
  - several plugins such as the:
    - Bertault (OGDF) layout,
    - Fast Multipole Embedder (OGDF) layout,
    - File System import,
    - Link Communities measure,
    - Quotient Clustering algorithm,
    - TLPB import,
    - Web Site import.
- drop use-libbfd.patch (upstream)

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

fix rpmlint errors

• Files Changed
• Browse Source

fix file list

• Files Changed
• Browse Source

- 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)
--This line, and those below, will be ignored--

M    0001-Install-to-lib64.patch
M    0002-Enable-tlprender.patch
M    0003-Enable-PPC-and-PPC64.patch
M    0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch
M    0005-Use-system-ftgl-lib-if-available.patch
M    0006-Find-system-ftgl.patch
D    0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch
D    tulip-4.7.0_src.tar.gz
A    tulip-4.8.0_src.tar.gz
M    tulip.changes
M    tulip.spec

Diff for working copy: .
Index: 0001-Install-to-lib64.patch
===================================================================

--- 0001-Install-to-lib64.patch	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ 0001-Install-to-lib64.patch	(working copy)
@@ -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?= <kkaempf@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
 

Index: 0002-Enable-tlprender.patch
===================================================================

--- 0002-Enable-tlprender.patch	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ 0002-Enable-tlprender.patch	(working copy)
@@ -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?= <kkaempf@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
 

Index: 0003-Enable-PPC-and-PPC64.patch
===================================================================

--- 0003-Enable-PPC-and-PPC64.patch	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ 0003-Enable-PPC-and-PPC64.patch	(working copy)
@@ -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?= <kkaempf@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
 

Index: 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch
===================================================================

--- 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch	(working copy)
@@ -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?= <kkaempf@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
 

Index: 0005-Use-system-ftgl-lib-if-available.patch
===================================================================

--- 0005-Use-system-ftgl-lib-if-available.patch	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ 0005-Use-system-ftgl-lib-if-available.patch	(working copy)
@@ -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?= <kkaempf@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
 

Index: 0006-Find-system-ftgl.patch
===================================================================

--- 0006-Find-system-ftgl.patch	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ 0006-Find-system-ftgl.patch	(working copy)
@@ -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?= <kkaempf@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
 

Index: tulip.changes
===================================================================

--- tulip.changes	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ tulip.changes	(working copy)
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Jan 11 08:37:00 UTC 2016 - kkaempf@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)
+
 -------------------------------------------------------------------
 Thu Oct  8 11:25:06 UTC 2015 - kkaempf@suse.com
 

Index: tulip.spec
===================================================================

--- tulip.spec	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ tulip.spec	(working copy)
@@ -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
@@ -205,7 +204,7 @@
 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

Index: tulip-4.8.0_src.tar.gz
===================================================================
Binary file 'tulip-4.8.0_src.tar.gz' added.

Index: 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch
===================================================================
--- 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch	(revision f5e17b2d975c97d9c216a89c2684d868)
+++ 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch	(working copy)
@@ -1,25 +0,0 @@
-From 6529feea5c410be9baae463e1783ea20c3c3c8c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
-Date: Thu, 8 Oct 2015 13:28:21 +0200
-Subject: [PATCH 7/7] fix for compilation error with Qt 5.5: add missing
- QObject include
-
----
- library/tulip-gui/include/tulip/PluginManager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/library/tulip-gui/include/tulip/PluginManager.h b/library/tulip-gui/include/tulip/PluginManager.h
-index d6c2fd93755f..99c1b30c21dd 100644
---- a/library/tulip-gui/include/tulip/PluginManager.h
-+++ b/library/tulip-gui/include/tulip/PluginManager.h
-@@ -21,6 +21,7 @@
- #ifndef PLUGINMANAGER_H
- #define PLUGINMANAGER_H
- 
-+#include <QObject>
- #include <QStringList>
- 
- #include <tulip/tulipconf.h>
--- 
-2.1.4
-

Index: tulip-4.7.0_src.tar.gz
===================================================================
Binary file 'tulip-4.7.0_src.tar.gz' deleted.

• Files Changed
• Browse Source

- Fix build with Qt 5.5
  Add 0007-fix-for-compilation-error-with-Qt-5.5-add-missing-QO.patch

• Files Changed
• Browse Source

- Fix build
  Add 0007-Forward-define-QObject.patch

• Files Changed
• Browse Source

• Files Changed
• Browse Source

libogdf -> libOGDF

• Files Changed
• Browse Source

- Update to 4.7.0
  Maintenance release, with bugfixes in
  - the OpenGL rendering engine,
  - the GUI, especially in the Adjacency Matrix, Geographic,
    Histogram, Parallel Coordinates, Scatter plot dedicated views.
  The computation performance of some clustering measures
  - Link communities, Louvain, MCL
  has been greatly improved too.
  Two new features have been also added;
  - a new edge drawing algorithm "Curve Edges" can be used to compute
    quadratic or cubic bezier paths for edges,
  - while the new rendering property "viewFontAwesomeIcon" ease the
    customization of nodes display, allowing to use one of the many
    predefined icons (about 600 are available) of the free "Font Awesome"
    iconic font (by David Gandy - see http://fontawesome.io)
    for the rendering of every node of a graph.
- Rebase all patches
- Drop 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch
  upstreamed.
--This line, and those below, will be ignored--

M    0001-Install-to-lib64.patch
M    0002-Enable-tlprender.patch
M    0003-Enable-PPC-and-PPC64.patch
M    0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch
M    0005-Use-system-ftgl-lib-if-available.patch
M    0006-Find-system-ftgl.patch
D    0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch
D    tulip-4.6.1_src.tar.gz
M    tulip.changes
M    tulip.spec

Diff for working copy: .
Index: 0001-Install-to-lib64.patch
===================================================================

--- 0001-Install-to-lib64.patch	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ 0001-Install-to-lib64.patch	(working copy)
@@ -1,17 +1,17 @@
-From c01497a4d4859402e93173b07c53be3a94e995aa Mon Sep 17 00:00:00 2001
+From 5322882d51bdf94ce0558320e956e926feccfa9f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 09:51:21 +0100
-Subject: [PATCH 1/7] Install to lib64
+Subject: [PATCH 1/6] Install to lib64
 
 ---
  CMakeLists.txt | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f592115aa16..7ed921bb11ff 100644
+index c493239d1cfa..3ed6f49567f2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -414,7 +414,12 @@ SET(TulipPythonInclude ${PROJECT_SOURCE_DIR}/library/tulip-python/include)
+@@ -387,7 +387,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.2
+2.1.4
 

Index: 0002-Enable-tlprender.patch
===================================================================

--- 0002-Enable-tlprender.patch	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ 0002-Enable-tlprender.patch	(working copy)
@@ -1,7 +1,7 @@
-From 649bfde022e0e2a4b4b5cedf0c7df17048705928 Mon Sep 17 00:00:00 2001
+From 0749491e172afae66aa9d209ddcbdae1c80b2d8e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 09:52:57 +0100
-Subject: [PATCH 2/7] Enable tlprender
+Subject: [PATCH 2/6] Enable tlprender
 
 ---
  software/CMakeLists.txt | 1 +
@@ -17,5 +17,5 @@
  ENDIF(APPLE)
 +ADD_SUBDIRECTORY(tlprender)
 -- 
-2.1.2
+2.1.4
 

Index: 0003-Enable-PPC-and-PPC64.patch
===================================================================

--- 0003-Enable-PPC-and-PPC64.patch	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ 0003-Enable-PPC-and-PPC64.patch	(working copy)
@@ -1,7 +1,7 @@
-From bff49eb5d2a9c4a61d8d2c16be20cade7050999d Mon Sep 17 00:00:00 2001
+From 51037fee41d564fd20eb64ba9556f69a0c381450 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 09:56:52 +0100
-Subject: [PATCH 3/7] Enable PPC and PPC64
+Subject: [PATCH 3/6] Enable PPC and PPC64
 
 ---
  library/tulip-core/include/tulip/SystemDefinition.h | 4 ++++
@@ -23,5 +23,5 @@
  #define OS_ARCHITECTURE "other"
  #endif
 -- 
-2.1.2
+2.1.4
 

Index: 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch
===================================================================

--- 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch	(working copy)
@@ -1,7 +1,7 @@
-From f8fbc3b6531f9d49892a85df96ae4e4314768ec1 Mon Sep 17 00:00:00 2001
+From 087e4bdbdbddb3d3be72c13fdf30375cb378f526 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 10:03:05 +0100
-Subject: [PATCH 4/7] Include string.h for libpng16 in GlTextureManager.cpp
+Subject: [PATCH 4/6] Include string.h for libpng16 in GlTextureManager.cpp
 
 ---
  library/tulip-ogl/src/GlTextureManager.cpp | 1 +
@@ -20,5 +20,5 @@
  
  #include <tulip/GlTextureManager.h>
 -- 
-2.1.2
+2.1.4
 

Index: 0005-Use-system-ftgl-lib-if-available.patch
===================================================================

--- 0005-Use-system-ftgl-lib-if-available.patch	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ 0005-Use-system-ftgl-lib-if-available.patch	(working copy)
@@ -1,7 +1,7 @@
-From cd313b906921bfb6873b8cca498036beb78deca8 Mon Sep 17 00:00:00 2001
+From 2c50bea125f608970371d879e084d25232736bf0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 10:15:54 +0100
-Subject: [PATCH 5/7] Use system ftgl lib if available
+Subject: [PATCH 5/6] Use system ftgl lib if available
 
 ---
  CMakeLists.txt            | 10 ++++++++--
@@ -9,10 +9,10 @@
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ed921bb11ff..a7ff02f8a592 100644
+index 3ed6f49567f2..248ef79f3f97 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -393,8 +393,14 @@ endif(QUAZIP_FOUND)
+@@ -363,8 +363,14 @@ endif(QUAZIP_FOUND)
  
  SET(QxtInclude ${PROJECT_SOURCE_DIR}/thirdparty/qxt/src)
  SET(QxtLibrary qxt-tulip-${TulipMMVersion})
@@ -30,7 +30,7 @@
  
  SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF)
 diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index ea7902e328f0..b77134dfcb63 100644
+index 49dd579a1780..3161df543454 100644
 --- a/thirdparty/CMakeLists.txt
 +++ b/thirdparty/CMakeLists.txt
 @@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(libqhull)
@@ -44,5 +44,5 @@
    ADD_SUBDIRECTORY(quazip)
  ENDIF(NOT QUAZIP_FOUND)
 -- 
-2.1.2
+2.1.4
 

Index: 0006-Find-system-ftgl.patch
===================================================================

--- 0006-Find-system-ftgl.patch	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ 0006-Find-system-ftgl.patch	(working copy)
@@ -1,7 +1,7 @@
-From d525559ae2b5ee178cb18a98da3e55acd35a3a28 Mon Sep 17 00:00:00 2001
+From 90e5d27d3e4f1215faa12a7b318f8fdf4f94f178 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
 Date: Tue, 11 Nov 2014 11:04:20 +0100
-Subject: [PATCH 6/7] Find system ftgl
+Subject: [PATCH 6/6] Find system ftgl
 
 ---
  FindFTGL.cmake | 7 ++++---
@@ -39,5 +39,5 @@
        /usr/X11/lib
        /usr/X11R6/lib
 -- 
-2.1.2
+2.1.4
 

Index: tulip.changes
===================================================================

--- tulip.changes	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ tulip.changes	(working copy)
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Jun 22 06:49:22 UTC 2015 - kkaempf@suse.com
+
+- Update to 4.7.0
+  Maintenance release, with bugfixes in
+  - the OpenGL rendering engine,
+  - the GUI, especially in the Adjacency Matrix, Geographic,
+    Histogram, Parallel Coordinates, Scatter plot dedicated views.
+
+  The computation performance of some clustering measures
+  - Link communities, Louvain, MCL
+  has been greatly improved too.
+
+  Two new features have been also added;
+  - a new edge drawing algorithm "Curve Edges" can be used to compute
+    quadratic or cubic bezier paths for edges,
+  - while the new rendering property "viewFontAwesomeIcon" ease the
+    customization of nodes display, allowing to use one of the many
+    predefined icons (about 600 are available) of the free "Font Awesome"
+    iconic font (by David Gandy - see http://fontawesome.io)
+    for the rendering of every node of a graph.
+
+- Rebase all patches
+
+- Drop 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch
+  upstreamed.
+
 -------------------------------------------------------------------
 Wed Apr 29 19:07:35 UTC 2015 - crrodriguez@opensuse.org
 

Index: tulip.spec
===================================================================

--- tulip.spec	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ tulip.spec	(working copy)
@@ -20,11 +20,11 @@
 Summary:        Visualization of huge graphs
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Visualization/Graph
-Version:        4.6.1
+Version:        4.7.0
 Release:        0
 Url:            http://www.tulip-software.org/
 # .so version
-%define tulip_version 4.6
+%define tulip_version 4.7
 Source:         %{name}-%{version}_src.tar.gz
 Source1:        %{name}.desktop
 Source4:        %{name}-rpmlintrc
@@ -39,8 +39,6 @@
 Patch5:         0005-Use-system-ftgl-lib-if-available.patch
 # Fix FindFTGL.cmake
 Patch6:         0006-Find-system-ftgl.patch
-# PATCH-FIX-UPSTREAM
-Patch7:         0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch
 Patch8:         use-libbfd.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -213,7 +211,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 
 %build

Index: 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch
===================================================================
--- 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch	(revision 161635c0ef0ae9fd79610a1b9244e70f)
+++ 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch	(working copy)
@@ -1,30 +0,0 @@
-From 315a2f86d30e8d92b5a2abe4c6aba564663a975c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
-Date: Mon, 2 Feb 2015 09:24:47 +0100
-Subject: [PATCH 7/7] fix Tulip build configuration with CMake version >= 3.1.0
- (sf bug #787)
-
-upstream svn commit r10536
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a7ff02f8a592..2cceba2b8846 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -108,7 +108,11 @@ FUNCTION(ADD_LIBRARY name)
-   IF(APPLE)
-     SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
-   ENDIF(APPLE)
-+  # CMake >= 3.1.0 does not allow to set the INSTALL_RPATH property on INTERFACE_LIBRARY target type
-+  GET_TARGET_PROPERTY(TARGET_TYPE ${name} TYPE)
-+  IF(NOT "${TARGET_TYPE}" STREQUAL "INTERFACE_LIBRARY")
-   SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_RPATH "$ORIGIN")
-+  ENDIF(NOT "${TARGET_TYPE}" STREQUAL "INTERFACE_LIBRARY")
-   IF(MSVC)
-     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}")
-     SET_TARGET_PROPERTIES(${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}")
--- 
-2.1.2
-

Index: tulip-4.6.1_src.tar.gz
===================================================================
Binary file 'tulip-4.6.1_src.tar.gz' deleted.

• Files Changed
• Browse Source

- Update to 4.7.0
  Maintenance release, with bugfixes in
  - the OpenGL rendering engine,
  - the GUI, especially in the Adjacency Matrix, Geographic,
    Histogram, Parallel Coordinates, Scatter plot dedicated views.
  The computation performance of some clustering measures
  - Link communities, Louvain, MCL
  has been greatly improved too.
  Two new features have been also added;
  - a new edge drawing algorithm "Curve Edges" can be used to compute
    quadratic or cubic bezier paths for edges,
  - while the new rendering property "viewFontAwesomeIcon" ease the
    customization of nodes display, allowing to use one of the many
    predefined icons (about 600 are available) of the free "Font Awesome"
    iconic font (by David Gandy - see http://fontawesome.io)
    for the rendering of every node of a graph.
- Rebase all patches
- Drop 0007-fix-Tulip-build-configuration-with-CMake-version-3.1.patch
  upstreamed.

• Files Changed
• Browse Source