Hello community,
here is the log from the commit of package tulip for openSUSE:Factory
checked in at Mon Mar 8 18:26:15 CET 2010.
--------
--- tulip/tulip.changes 2010-03-06 19:05:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/tulip/tulip.changes 2010-03-07 22:12:49.000000000 +0100
@@ -1,0 +2,11 @@
+Sun Mar 7 10:44:50 UTC 2010 - kkaempf@novell.com
+
+- Update to 3.3.1
+ This a maintenance release with many bug fixes, especially in the
+ rendering and management of meta nodes, the download of plugins, and
+ the cmake files.
+ Also fixes all but one gcc 4.5 build issues.
+
+- Add some patches to prepare for CMake build. (disabled)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
tulip-3.3.0-devHandbook.pdf
tulip-3.3.0-userManual.pdf
tulip-3.3.0.tar.bz2
New:
----
enable-tlprender.patch
lib64-install.patch
tulip-3.3.1-devHandbook.pdf
tulip-3.3.1-userManual.pdf
tulip-3.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tulip.spec ++++++
--- /var/tmp/diff_new_pack.DiQglq/_old 2010-03-08 18:26:02.000000000 +0100
+++ /var/tmp/diff_new_pack.DiQglq/_new 2010-03-08 18:26:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package tulip (Version 3.3.0)
+# spec file for package tulip (Version 3.3.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,9 +17,11 @@
# norootforbuild
+%define use_cmake 0
Name: tulip
BuildRequires: Mesa-devel doxygen freefont ftgl-devel glew-devel libdrm-devel libjpeg-devel libqt4-devel libxml2-devel update-alternatives update-desktop-files xorg-x11-devel
+BuildRequires: cmake
%if 0%{?suse_version} > 1110
BuildRequires: libgle-devel
%else
@@ -32,8 +34,8 @@
BuildRequires: fdupes
%endif
Summary: Visualization of huge graphs
-Version: 3.3.0
-Release: 3
+Version: 3.3.1
+Release: 1
# .so version
%define tulip_version 3.3
Url: http://www.tulip-software.org
@@ -42,8 +44,9 @@
Source2: tulip-%{version}-userManual.pdf
Source3: tulip-%{version}-devHandbook.pdf
Source4: tulip-rpmlintrc
-# PATCH-FIX-UPSTREAM tulip-gcc45.patch dimstar@opensuse.org -- Fix build with gcc 4.5 - patch cherry-picked from upstream svn.
-Patch0: tulip-gcc45.patch
+Patch: tulip-gcc45.patch
+Patch1: lib64-install.patch
+Patch2: enable-tlprender.patch
License: GPLv2+
Group: Productivity/Graphics/Visualization/Graph
Requires: Mesa
@@ -243,10 +246,19 @@
%prep
%setup -q
-%patch0 -p1
+%patch -p1
+%patch1 -p1
+%patch2 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
+
+%if 0%{?use_cmake}
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+ -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 ..
+%else
autoreconf --force --install
#./gen-conf.sh
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -265,6 +277,8 @@
--x-libraries=%{_libdir} \
--with-gl-includes=%{_includedir} \
--with-gl-libraries=%{_libdir}
+%endif
+
# parallel make is not working, do not use it. -Marcus 20091115
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
# generating docs during build is disabled
@@ -313,7 +327,9 @@
%{_bindir}/tlprender
%{_datadir}/applications/*.desktop
%dir %{_libdir}/tlp
-%{_libdir}/libtulip-pluginsmanager.so
+%if 0%{?use_cmake} == 0
+%{_libdir}/libtulip-pluginsmanager.so*
+%endif
%{_libdir}/libtulip-pluginsmanager-%{tulip_version}.so*
%dir %{_libdir}/tlp/bitmaps
%{_libdir}/tlp/bitmaps/*
++++++ enable-tlprender.patch ++++++
diff -wruN ../orig-tulip-3.3.1/software/CMakeLists.txt ./software/CMakeLists.txt
--- ../orig-tulip-3.3.1/software/CMakeLists.txt 2010-01-18 20:32:27.000000000 +0100
+++ ./software/CMakeLists.txt 2010-03-07 20:20:35.000000000 +0100
@@ -1,4 +1,4 @@
ADD_SUBDIRECTORY(plugins-manager)
ADD_SUBDIRECTORY(tulip)
-#ADD_SUBDIRECTORY(tlprender)
+ADD_SUBDIRECTORY(tlprender)
++++++ lib64-install.patch ++++++
diff -wruN ../orig-tulip-3.3.1/CMakeLists.txt ./CMakeLists.txt
--- ../orig-tulip-3.3.1/CMakeLists.txt 2010-01-18 20:34:02.000000000 +0100
+++ ./CMakeLists.txt 2010-03-07 20:22:08.000000000 +0100
@@ -95,11 +95,17 @@
## -----------------------------------------------------------------------------------------------
## Install paths
## -----------------------------------------------------------------------------------------------
+# Library
+IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ SET(TulipLibInstallDir /lib64/)
+ELSE(CMAKE_SIZEOF_VOID_P MATCHES "8")
SET(TulipLibInstallDir /lib/)
+ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+
SET(TulipBinInstallDir /bin/)
SET(TulipIncludeInstallDir /include/)
SET(TulipShareInstallDir /share/)
-SET(TulipBitmapInstallDir /lib/tlp/bitmaps/)
+SET(TulipBitmapInstallDir /share/tulip/bitmaps/)
## -----------------------------------------------------------------------------------------------
## Set UseTulip file name
++++++ tulip-3.3.0-devHandbook.pdf -> tulip-3.3.1-devHandbook.pdf ++++++
(binary differes)
++++++ tulip-3.3.0-userManual.pdf -> tulip-3.3.1-userManual.pdf ++++++
(binary differes)
++++++ tulip-3.3.0.tar.bz2 -> tulip-3.3.1.tar.bz2 ++++++
tulip/tulip-3.3.0.tar.bz2 /mounts/work_src_done/STABLE/tulip/tulip-3.3.1.tar.bz2 differ: char 11, line 1
++++++ tulip-gcc45.patch ++++++
--- /var/tmp/diff_new_pack.DiQglq/_old 2010-03-08 18:26:03.000000000 +0100
+++ /var/tmp/diff_new_pack.DiQglq/_new 2010-03-08 18:26:03.000000000 +0100
@@ -1,103 +1,7 @@
-Index: tulip-3.3.0/library/tulip/include/tulip/Bfs.h
-===================================================================
---- tulip-3.3.0.orig/library/tulip/include/tulip/Bfs.h
-+++ tulip-3.3.0/library/tulip/include/tulip/Bfs.h
-@@ -39,8 +39,8 @@ class TLP_SCOPE Bfs {
-
- BooleanProperty* s_proxy;
- unsigned int nbNodes;
-- MutableContainer<bool>::MutableContainer selectedNodes;
-- MutableContainer<bool>::MutableContainer selectedEdges;
-+ MutableContainer<bool> selectedNodes;
-+ MutableContainer<bool> selectedEdges;
-
- };
- }
-Index: tulip-3.3.0/library/tulip/include/tulip/Ordering.h
-===================================================================
---- tulip-3.3.0.orig/library/tulip/include/tulip/Ordering.h
-+++ tulip-3.3.0/library/tulip/include/tulip/Ordering.h
-@@ -52,21 +52,21 @@ class TLP_SCOPE Ordering : public std::v
-
- private :
-
-- PlanarConMap::PlanarConMap * Gp;
-- MutableContainer<int>::MutableContainer oute;
-- MutableContainer<int>::MutableContainer outv;
-- MutableContainer<bool>::MutableContainer visitedNodes;
-- MutableContainer<bool>::MutableContainer visitedFaces;
-- MutableContainer<bool>::MutableContainer markedFaces;
-- MutableContainer<int>::MutableContainer seqP;
-- MutableContainer<bool>::MutableContainer isOuterFace;
-- MutableContainer<bool>::MutableContainer contour;
-- MutableContainer<bool>::MutableContainer is_selectable;
-- MutableContainer<bool>::MutableContainer is_selectable_visited;
-- MutableContainer<bool>::MutableContainer is_selectable_face;
-- MutableContainer<bool>::MutableContainer is_selectable_visited_face;
-- MutableContainer<node>::MutableContainer left;
-- MutableContainer<node>::MutableContainer right;
-+ PlanarConMap * Gp;
-+ MutableContainer<int> oute;
-+ MutableContainer<int> outv;
-+ MutableContainer<bool> visitedNodes;
-+ MutableContainer<bool> visitedFaces;
-+ MutableContainer<bool> markedFaces;
-+ MutableContainer<int> seqP;
-+ MutableContainer<bool> isOuterFace;
-+ MutableContainer<bool> contour;
-+ MutableContainer<bool> is_selectable;
-+ MutableContainer<bool> is_selectable_visited;
-+ MutableContainer<bool> is_selectable_face;
-+ MutableContainer<bool> is_selectable_visited_face;
-+ MutableContainer<node> left;
-+ MutableContainer<node> right;
- bool existMarkedF;
- FaceAndPos minMarkedFace ;
- Face ext;
-Index: tulip-3.3.0/plugins/layout/MixedModel.cpp
-===================================================================
---- tulip-3.3.0.orig/plugins/layout/MixedModel.cpp
-+++ tulip-3.3.0/plugins/layout/MixedModel.cpp
-@@ -177,7 +177,7 @@ bool MixedModel::run() {
- if(!planar){
- // cout << "Graph is not planar ...";
- BooleanProperty * resultatAlgoSelection = currentGraph->getProperty<BooleanProperty>("viewSelection");
-- Bfs::Bfs sp(currentGraph,resultatAlgoSelection);
-+ Bfs sp(currentGraph,resultatAlgoSelection);
- currentGraph->delSubGraph(sp.graph);
- G = tlp::newSubGraph(currentGraph);
- Iterator<edge> * ite = currentGraph->getEdges();
-Index: tulip-3.3.0/plugins/layout/MixedModel.h
-===================================================================
---- tulip-3.3.0.orig/plugins/layout/MixedModel.h
-+++ tulip-3.3.0/plugins/layout/MixedModel.h
-@@ -103,7 +103,7 @@ class MixedModel : public tlp::LayoutAlg
- tlp::Graph * currentGraph;
- std::vectortlp::edge dummy;
- std::map