openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

Revisions of tulip

Klaus Kämpf (kwk) committed almost 10 years ago (revision 59)

..

Klaus Kämpf (kwk) committed almost 10 years ago (revision 58)

Klaus Kämpf (kwk) committed almost 10 years ago (revision 57)

Klaus Kämpf (kwk) committed almost 10 years ago (revision 56)

Klaus Kämpf (kwk) committed almost 10 years ago (revision 55)

Klaus Kämpf (kwk) committed almost 10 years ago (revision 54)

Klaus Kämpf (kwk) committed almost 10 years ago (revision 53)

- Update to 4.6.1
  This is a minor maintenance release with bug fixes and improvements
  mainly in:
  - the OpenGL rendering engine,
  - the Python components,
  - the Qt5 build,
  - the Geographic view.
- drop libtulip-qt4 package
- Add use-libbfd.patch

- Update to 4.6.0
- Patches redone
  tulip-lib64-install.patch
  -> 0001-Install-to-lib64.patch
  tulip-enable-tlprender.patch
  -> 0002-Enable-tlprender.patch
  tulip-ppc64.patch
  -> 0003-Enable-PPC-and-PPC64.patch
  tulip-libpng16.patch
  -> 0004-Include-string.h-for-libpng16-in-GlTextureManager.cp.patch
  tulip-system-ftgl.patch
  -> 0005-Use-system-ftgl-lib-if-available.patch
- Patches upstreamed or obsolete
  * add-return-to-nonvoid-functions.patch
  * tulip-3.7.0-src-fix-bashisms.patch
  * tulip-cmake-2.8.12.patch
  * tulip-crash-handler.patch
  * tulip-gcc-4.7.patch
  * tulip-3.7.0-src-fix-bashisms.patch
- Add tulip-cmake-2.8.12.patch: Fix build with cmake 2.8.12.

buildservice-autocommit accepted request 260601 from

Klaus Kämpf (kwk) about 10 years ago (revision 52)

baserev update by copy to link target

Klaus Kämpf (kwk) accepted request 260281 from

Oleksandr Chumachenko (Ledest) about 10 years ago (revision 51)

Fix bashisms in scripts

buildservice-autocommit accepted request 221789 from

Ismail Dönmez (namtrac) almost 11 years ago (revision 50)

baserev update by copy to link target

Ismail Dönmez (namtrac) accepted request 221788 from

Dominique Leuenberger (dimstar) almost 11 years ago (revision 49)

- Add tulip-cmake-2.8.12.patch: Fix build with cmake 2.8,12.

buildservice-autocommit accepted request 172961 from

Klaus Kämpf (kwk) over 11 years ago (revision 48)

baserev update by copy to link target

Klaus Kämpf (kwk) accepted request 172723 from

Petr Gajdos (pgajdos) over 11 years ago (revision 47)

- build against system ftgl

Petr Gajdos (pgajdos) committed over 11 years ago (revision 46)

- builds also with libpng16
  * libpng16.patch

buildservice-autocommit accepted request 135131 from

Togan Muftuoglu (toganm) about 12 years ago (revision 45)

baserev update by copy to link target

Togan Muftuoglu (toganm) accepted request 135124 from

Stephan Kulow (coolo) about 12 years ago (revision 44)

- add explicit buildrequire on pkgconfig(glu)

buildservice-autocommit accepted request 128134 from

Marcus Meissner (msmeissn) over 12 years ago (revision 43)

baserev update by copy to link target

Marcus Meissner (msmeissn) accepted request 128130 from

Dinar Valeev (k0da) over 12 years ago (revision 42)

- Completely disable crash handler on archs other than x86
- refresh libdir patch
- define ppc architecture

buildservice-autocommit accepted request 117028 from

Klaus Kämpf (kwk) over 12 years ago (revision 41)

baserev update by copy to link target

Klaus Kämpf (kwk) accepted request 117027 from

Klaus Kämpf (kwk) over 12 years ago (revision 40)

- Fix GCC 4.7 build

- Update to 3.7.0
  - New import plugins for the Pajek an UCINET file formats.
  - The management of out or inout parameters for algorithm plugins
    have been added.
  - The Graph API has been extended.
  - The CSV import wizard and the Python scripting view have been
    improved.
  - Many bugs were fixed especially in the rendering of labels,
    the curve rendering of edges and the management of the GUI.

- Update to 3.6.1
  This is a maintenance release with many bug fixes, especially in the
  rendering of edges and labels. It includes improvements for the Python
  Scripting view, and new methods for the management of subgraphs.
- switch documentation format from PDF to HTML
- Update to 3.6.0
  This new version brings quite a lot of stuff :
  - New "Screenshot" button, allowing to export an image of the current
    graph to any resolution !
  - All the OGDF algorithms are now installed by default
  - new labeling system, makes text much more readable
  - new TableView allows to easily see and edit your data in a tabular
    format
  - lots of UI improvements to make Tulip more intuitive (the leftmost
    panel shows a disabled style while not useable)
  - Attributes are saved on subgraphs
  - Integration of a multitouch patch that allows zooming using the
    "pinch" gesture
--This line, and those below, will be ignored--

  Algorithms are not run in a background thread anymore, as some
  plug-ins created GUI elements, and Qt widgets should only be created
  in the main thread.
- Update to 3.5.0
  This release is only the beginning of some exciting changes in
  Tulip's UI to make it more user-friendly. 
  - CSV Import
    The CSV import was re-written from scratch, and now takes the form
    of a wizard.
  - Cosmetic changes
    A few details here and there were tweaked, that will make the
    overall user experience smoother.
  - Python
    We finally integrated the python scripting support into Tulip !
  - Under the hood
    Tulip 3.5 has seen some refactoring and optimizations, and we have
    an increase of over 200% for edge rendering performances, removed lots
    of old code, and we made a huge step in getting rid of the
    displaylists for good !
    

old: graphics/tulip
new: home:kwk:branches:graphics/tulip rev NoneIndex: tulip-enable-tlprender.patch
===================================================================
--- tulip-enable-tlprender.patch (revision 39)
+++ tulip-enable-tlprender.patch (revision 16)
@@ -1,10 +1,10 @@
-Index: tulip-3.3.1/software/CMakeLists.txt
-===================================================================
---- tulip-3.3.1.orig/software/CMakeLists.txt
-+++ tulip-3.3.1/software/CMakeLists.txt
-@@ -1,4 +1,4 @@
- ADD_SUBDIRECTORY(plugins-manager)
- ADD_SUBDIRECTORY(tulip)
--#ADD_SUBDIRECTORY(tlprender)
-+ADD_SUBDIRECTORY(tlprender)
- 
+diff -wruN -x '*~' ../orig-tulip-3.6.1-src/software/CMakeLists.txt ./software/CMakeLists.txt
+--- ../orig-tulip-3.6.1-src/software/CMakeLists.txt	2011-11-14 09:01:48.000000000 +0100
++++ ./software/CMakeLists.txt	2012-02-08 13:01:43.000000000 +0100
+@@ -4,5 +4,5 @@
+ 
+ ADD_SUBDIRECTORY(plugins-manager)
+ ADD_SUBDIRECTORY(tulip)
+-#ADD_SUBDIRECTORY(tlprender)
++ADD_SUBDIRECTORY(tlprender)
+ 
Index: tulip-lib64-install.patch
===================================================================
--- tulip-lib64-install.patch (revision 39)
+++ tulip-lib64-install.patch (revision 16)
@@ -1,23 +1,16 @@
-Index: tulip-3.3.1/CMakeLists.txt
-===================================================================
---- tulip-3.3.1.orig/CMakeLists.txt
-+++ tulip-3.3.1/CMakeLists.txt
-@@ -95,11 +95,17 @@ SET(TulipPluginsManagerInclude ${PROJECT
- ## -----------------------------------------------------------------------------------------------
- ## 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
+diff -wruN -x '*~' ../orig-tulip-3.6.1-src/CMakeLists.txt ./CMakeLists.txt
+--- ../orig-tulip-3.6.1-src/CMakeLists.txt	2011-11-14 09:01:26.000000000 +0100
++++ ./CMakeLists.txt	2012-02-08 13:00:02.000000000 +0100
+@@ -277,7 +277,12 @@
+ SET(TulipBitmapInstallDir ${TulipShareInstallDir}/bitmaps/)
+ SET(TulipAppleResourcesDir ${TulipAppleContentsDir}Resources/)
+ ELSE()
++# 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(TulipPluginsInstallDir ${TulipLibInstallDir}/tulip/)
+ SET(TulipBinInstallDir bin/)
+ SET(TulipIncludeInstallDir include/)
Index: tulip.changes
===================================================================
--- tulip.changes (revision 39)
+++ tulip.changes (revision 16)
@@ -1,4 +1,67 @@
 -------------------------------------------------------------------
+Wed May  2 12:34:50 UTC 2012 - kkaempf@suse.com
+
+- Fix GCC 4.7 build
+
+-------------------------------------------------------------------
+Wed Feb 22 08:22:17 UTC 2012 - kkaempf@suse.com
+
+- Update to 3.7.0
+  - New import plugins for the Pajek an UCINET file formats.
+  - The management of out or inout parameters for algorithm plugins
+    have been added.
+  - The Graph API has been extended.
+  - The CSV import wizard and the Python scripting view have been
+    improved.
+  - Many bugs were fixed especially in the rendering of labels,
+    the curve rendering of edges and the management of the GUI.
+
+-------------------------------------------------------------------
+Wed Feb  8 12:03:54 UTC 2012 - kkaempf@suse.com
+
+- Update to 3.6.1
+  This is a maintenance release with many bug fixes, especially in the
+  rendering of edges and labels. It includes improvements for the Python
+  Scripting view, and new methods for the management of subgraphs.
+
+- switch documentation format from PDF to HTML
+
+- Update to 3.6.0
+  This new version brings quite a lot of stuff :
+  - New "Screenshot" button, allowing to export an image of the current
+    graph to any resolution !
+  - All the OGDF algorithms are now installed by default
+  - new labeling system, makes text much more readable
+  - new TableView allows to easily see and edit your data in a tabular
+    format
+  - lots of UI improvements to make Tulip more intuitive (the leftmost
+    panel shows a disabled style while not useable)
+  - Attributes are saved on subgraphs
+  - Integration of a multitouch patch that allows zooming using the
+    "pinch" gesture
+
+  Algorithms are not run in a background thread anymore, as some
+  plug-ins created GUI elements, and Qt widgets should only be created
+  in the main thread.
+
+- Update to 3.5.0
+  This release is only the beginning of some exciting changes in
+  Tulip's UI to make it more user-friendly. 
+  - CSV Import
+    The CSV import was re-written from scratch, and now takes the form
+    of a wizard.
+  - Cosmetic changes
+    A few details here and there were tweaked, that will make the
+    overall user experience smoother.
+  - Python
+    We finally integrated the python scripting support into Tulip !
+  - Under the hood
+    Tulip 3.5 has seen some refactoring and optimizations, and we have
+    an increase of over 200% for edge rendering performances, removed lots
+    of old code, and we made a huge step in getting rid of the
+    displaylists for good !
+    
+-------------------------------------------------------------------
 Tue Nov 15 13:15:42 UTC 2011 - coolo@suse.com
 
 - add libtool as buildrequire to avoid implicit dependency
Index: tulip.spec
===================================================================
--- tulip.spec (revision 39)
+++ tulip.spec (revision 16)
@@ -1,7 +1,7 @@
 #
 # spec file for package tulip
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,30 +15,32 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-%define use_cmake 0
 
 Name:           tulip
 Summary:        Visualization of huge graphs
-Version:        3.3.1
-Release:        7
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Visualization/Graph
+Version:        3.7.0
+Release:        0
 Url:            http://www.tulip-software.org/
 # .so version
-%define tulip_version 3.3
-Source:         %{name}-%{version}.tar.bz2
+%define tulip_version 3.7
+Source:         %{name}-%{version}-src.tar.bz2
 Source1:        %{name}.desktop
-Source2:        %{name}-%{version}-userManual.pdf
-Source3:        %{name}-%{version}-devHandbook.pdf
+Source2:        %{name}-%{version}-html.tar.bz2
 Source4:        %{name}-rpmlintrc
-Patch:          %{name}-gcc45.patch
 Patch1:         %{name}-lib64-install.patch
 Patch2:         %{name}-enable-tlprender.patch
+# add return statements to nonvoid function without return
+# upstream #3490918
+Patch3:         add-return-to-nonvoid-functions.patch
+Patch4:         %{name}-gcc-4.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  Mesa-devel
+BuildRequires:  cmake
+BuildRequires:  dos2unix
 BuildRequires:  doxygen
+BuildRequires:  fdupes
 BuildRequires:  freefont
 BuildRequires:  ftgl-devel
 BuildRequires:  glew-devel
@@ -50,8 +52,6 @@
 BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-BuildRequires:  cmake
-BuildRequires:  fdupes
 %if 0%{?suse_version} > 1130
 BuildRequires:  qt4-assistant-adp-devel
 %endif
@@ -80,7 +80,6 @@
 * Automatic Metric coloration of graphs
 
 %package devel
-License:        GPL-2.0+
 Summary:        Visualization of huge graphs - development files
 Group:          Development/Libraries/Other
 Requires:       tulip = %{version}
@@ -104,7 +103,6 @@
 * Automatic Metric coloration of graphs
 
 %package doc
-License:        GPL-2.0+
 Summary:        Visualization of huge graphs - user documentation
 Group:          Productivity/Graphics/Visualization/Graph
 Requires:       tulip = %{version}
@@ -128,7 +126,6 @@
 * Automatic Metric coloration of graphs
 
 %package devel-doc
-License:        GPL-2.0+
 Summary:        Visualization of huge graphs - development documentation
 Group:          Documentation/HTML
 Requires:       tulip-doc = %{version}
@@ -152,15 +149,21 @@
 * Automatic Metric coloration of graphs
 
 %package -n     libtulip
-License:        GPL-2.0+
 Summary:        A library for handling large graphs
 Group:          Productivity/Graphics/Visualization/Graph
 
 %description -n libtulip
 See package 'tulip' for details.
 
+%package -n     tulip-ogdf
+Summary:        A library for displaying graph in a GL context
+Group:          Productivity/Graphics/Visualization/Graph
+Requires:       Mesa
+
+%description -n tulip-ogdf
+See package 'tulip' for details.
+
 %package -n     libtulip-ogl
-License:        GPL-2.0+
 Summary:        A library for displaying graph in a GL context
 Group:          Productivity/Graphics/Visualization/Graph
 Requires:       Mesa
@@ -169,7 +172,6 @@
 See package 'tulip' for details.
 
 %package -n     libtulip-qt4
-License:        GPL-2.0+
 Provides:       libtulip-qt3
 Obsoletes:      libtulip-qt3
 Summary:        A set of Qt Widgets for tulip/tulip-ogl
@@ -179,36 +181,25 @@
 See package 'tulip' for details.
 
 %prep
-%setup -q
-%patch -p1
+%setup -q -n %{name}-%{version}-src
+dos2unix CMakeLists.txt
 %patch1 -p1
 # tlprender disabled until OSmesa is available
 ##%patch2 -p1
+%patch3 -p1
+%if 0%{?suse_version} > 1210
+%patch4 -p1
+%endif
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
 
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated"
 
-%if 0%{?use_cmake}
-
-cmake ./ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+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
-%configure \
-  --docdir=%{_docdir}/tulip \
- --enable-shared \
- --with-pic \
- --disable-static \
- --enable-stats-gui \
-
-%endif
+  -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1
 
 # parallel make is not working, do not use it. -Marcus 20091115
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -219,17 +210,19 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-cp %{_sourcedir}/tulip-%{version}-devHandbook.pdf .
-cp %{_sourcedir}/tulip-%{version}-userManual.pdf .
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/tulip
+(cd $RPM_BUILD_ROOT%{_datadir}/tulip; tar xf %{S:2}; mv %{name}-%{version}-html html)
+%fdupes $RPM_BUILD_ROOT%{_datadir}/tulip/html
+chmod -x NEWS
 #cd docs
 #sh gen-profile.sh
 #make DESTDIR=${RPM_BUILD_ROOT} install
 #cd ..
 %suse_update_desktop_file -i tulip Graphics 3DGraphics
 find $RPM_BUILD_ROOT%{_libdir} -name *.la | xargs rm -f
-# %fdupes $RPM_BUILD_ROOT/%{_mandir}/man3
 %fdupes $RPM_BUILD_ROOT%{_docdir}/tulip
 %fdupes $RPM_BUILD_ROOT%{_includedir}/tulip
+
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 
 %clean
@@ -250,121 +243,133 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/tulip
+%{_bindir}/tulip_app
+%{_bindir}/tulip_need_restart
 %{_bindir}/tulip_check_pl
 # tlprender disabled until OSmesa is available
 ##%{_bindir}/tlprender
 %{_datadir}/applications/*.desktop
-%dir %{_libdir}/tlp
-%if 0%{?use_cmake} == 0
-%{_libdir}/libtulip-pluginsmanager.so*
-%endif
-%{_libdir}/libtulip-pluginsmanager-%{tulip_version}.so*
-%dir %{_libdir}/tlp/bitmaps
-%{_libdir}/tlp/bitmaps/*
+#%dir %{_libdir}/tlp
+#%{_libdir}/libtulip-pluginsmanager-%{tulip_version}.so*
 %dir %{_datadir}/tulip
-%{_datadir}/tulip/*
+%dir %{_datadir}/tulip/bitmaps
+%{_datadir}/tulip/bitmaps/*
+%{_datadir}/tulip/tulip*
 %doc NEWS
 
+%files -n tulip-ogdf
+%defattr(-,root,root)
+%{_libdir}/libOGDF.so
+%dir %{_libdir}/tulip
+%{_libdir}/tulip/libogdf*
+%{_libdir}/libtulip-ogdf-%{tulip_version}.so
+
 %files -n libtulip
 %defattr(-,root,root)
 %{_bindir}/tulip-config
-%{_libdir}/libtulip.so
-%{_libdir}/libtulip-%{tulip_version}.so*
-%{_libdir}/tlp/libAdjacencyMatrixImport-%{version}.*
-%{_libdir}/tlp/libArityMetric-%{version}.*
-%{_libdir}/tlp/libAutoSize-%{version}.*
-%{_libdir}/tlp/libBetweennessCentrality-%{version}.*
-%{_libdir}/tlp/libBiconnectedComponent-%{version}.*
-%{_libdir}/tlp/libBubbleTree-%{version}.*
-%{_libdir}/tlp/libCircular-%{version}.*
-%{_libdir}/tlp/libClusterMetric-%{version}.*
-%{_libdir}/tlp/libCompleteGraph-%{version}.*
-%{_libdir}/tlp/libCompleteTree-%{version}.*
-%{_libdir}/tlp/libConeTreeExtended-%{version}.*
-%{_libdir}/tlp/libConnectedComponent-%{version}.*
-%{_libdir}/tlp/libConnectedComponentPacking-%{version}.*
-%{_libdir}/tlp/libDagLevelMetric-%{version}.*
-%{_libdir}/tlp/libDendrogram-%{version}.*
-%{_libdir}/tlp/libDepthMetric-%{version}.*
-%{_libdir}/tlp/libDotImport-%{version}.*
-%{_libdir}/tlp/libEccentricity-%{version}.*
-%{_libdir}/tlp/libEmbedder-%{version}.*
-%{_libdir}/tlp/libEqualValueClustering-%{version}.*
-%{_libdir}/tlp/libGemLayout-%{version}.*
-%{_libdir}/tlp/libHierarchicalGraph-%{version}.*
-%{_libdir}/tlp/libGMLExport-%{version}.*
-%{_libdir}/tlp/libGMLImport-%{version}.*
-%{_libdir}/tlp/libGrid-%{version}.*
-%{_libdir}/tlp/libHierarchicalClustering-%{version}.*
-%{_libdir}/tlp/libIdMetric-%{version}.*
-%{_libdir}/tlp/libImprovedWalker-%{version}.*
-%{_libdir}/tlp/libInducedSubGraphSelection-%{version}.*
-%{_libdir}/tlp/libKruskal-%{version}.*
-%{_libdir}/tlp/libLeafMetric-%{version}.*
-%{_libdir}/tlp/libLoopSelection-%{version}.*
-%{_libdir}/tlp/libMetricColorMapping-%{version}.*
-%{_libdir}/tlp/libMetricSizeMapping-%{version}.*
-%{_libdir}/tlp/libMixedModel-%{version}.*
-%{_libdir}/tlp/libMultipleSelection-%{version}.*
-%{_libdir}/tlp/libNodeMetric-%{version}.*
-%{_libdir}/tlp/libPathLengthMetric-%{version}.*
-%{_libdir}/tlp/libPlanarGraph-%{version}.*
-%{_libdir}/tlp/libQuotientClustering-%{version}.*
-%{_libdir}/tlp/libRandom-%{version}.*
-%{_libdir}/tlp/libRandomGraph-%{version}.*
-%{_libdir}/tlp/libRandomMetric-%{version}.*
-%{_libdir}/tlp/libRandomSimpleGraph-%{version}.*
-%{_libdir}/tlp/libRandomTree-%{version}.*
-%{_libdir}/tlp/libRandomTreeGeneral-%{version}.*
-%{_libdir}/tlp/libReachableSubGraphSelection-%{version}.*
-%{_libdir}/tlp/libSmallWorldGraph-%{version}.*
-%{_libdir}/tlp/libSpanningDagSelection-%{version}.*
-%{_libdir}/tlp/libSpanningTreeSelection-%{version}.*
-%{_libdir}/tlp/libSquarifiedTreeMap-%{version}.*
-%{_libdir}/tlp/libStrahlerMetric-%{version}.*
-%{_libdir}/tlp/libStrengthClustering-%{version}.*
-%{_libdir}/tlp/libStrengthMetric-%{version}.*
-%{_libdir}/tlp/libStrongComponent-%{version}.*
-%{_libdir}/tlp/libTreeLeaf-%{version}.*
-%{_libdir}/tlp/libTreeMap-%{version}.*
-%{_libdir}/tlp/libTreeRadial-%{version}.*
-%{_libdir}/tlp/libTreeReingoldAndTilforExtended-%{version}.*
-%{_libdir}/tlp/libTutte-%{version}.*
+%{_libdir}/libftgl.so
+%{_libdir}/libgzstream.so
+%{_libdir}/libtulip-%{tulip_version}.*
+%dir %{_libdir}/tulip
+%dir %{_libdir}/tulip/interactors
+%{_libdir}/tulip/interactors/lib*so
+%{_libdir}/tulip/libAdjacencyMatrixImport-%{version}.*
+%{_libdir}/tulip/libAutoSize-%{version}.*
+%{_libdir}/tulip/libBetweennessCentrality-%{version}.*
+%{_libdir}/tulip/libBiconnectedComponent-%{version}.*
+%{_libdir}/tulip/libBubbleTree-%{version}.*
+%{_libdir}/tulip/libCircular-%{version}.*
+%{_libdir}/tulip/libClusterMetric-%{version}.*
+%{_libdir}/tulip/libColorMapping-%{version}.so
+%{_libdir}/tulip/libCompleteGraph-%{version}.*
+%{_libdir}/tulip/libCompleteTree-%{version}.*
+%{_libdir}/tulip/libConeTreeExtended-%{version}.*
+%{_libdir}/tulip/libConnectedComponent-%{version}.*
+%{_libdir}/tulip/libConnectedComponentPacking-%{version}.*
+%{_libdir}/tulip/libDagLevelMetric-%{version}.*
+%{_libdir}/tulip/libDegreeMetric-%{version}.so
+%{_libdir}/tulip/libdelaunay-%{version}.so
+%{_libdir}/tulip/libDendrogram-%{version}.*
+%{_libdir}/tulip/libDepthMetric-%{version}.*
+%{_libdir}/tulip/libDotImport-%{version}.*
+%{_libdir}/tulip/libEccentricity-%{version}.*
+%{_libdir}/tulip/libEqualValueClustering-%{version}.*
+%{_libdir}/tulip/libGemLayout-%{version}.*
+%{_libdir}/tulip/libHierarchicalGraph-%{version}.*
+%{_libdir}/tulip/libGMLExport-%{version}.*
+%{_libdir}/tulip/libGMLImport-%{version}.*
+%{_libdir}/tulip/libGrid-%{version}.*
+%{_libdir}/tulip/libHierarchicalClustering-%{version}.*
+%{_libdir}/tulip/libIdMetric-%{version}.*
+%{_libdir}/tulip/libImportPajek-%{version}.so
+%{_libdir}/tulip/libImportUCINET-%{version}.so
+%{_libdir}/tulip/libImprovedWalker-%{version}.*
+%{_libdir}/tulip/libInducedSubGraphSelection-%{version}.*
+%{_libdir}/tulip/libKruskal-%{version}.*
+%{_libdir}/tulip/libLeafMetric-%{version}.*
+%{_libdir}/tulip/libLoopSelection-%{version}.*
+%{_libdir}/tulip/libMetricSizeMapping-%{version}.*
+%{_libdir}/tulip/libMixedModel-%{version}.*
+%{_libdir}/tulip/libMultipleSelection-%{version}.*
+%{_libdir}/tulip/libNodeMetric-%{version}.*
+%{_libdir}/tulip/libPathLengthMetric-%{version}.*
+%{_libdir}/tulip/libPlanarGraph-%{version}.*
+%{_libdir}/tulip/libQuotientClustering-%{version}.*
+%{_libdir}/tulip/libRandom-%{version}.*
+%{_libdir}/tulip/libRandomGraph-%{version}.*
+%{_libdir}/tulip/libRandomMetric-%{version}.*
+%{_libdir}/tulip/libRandomSimpleGraph-%{version}.*
+%{_libdir}/tulip/libRandomTree-%{version}.*
+%{_libdir}/tulip/libRandomTreeGeneral-%{version}.*
+%{_libdir}/tulip/libReachableSubGraphSelection-%{version}.*
+%{_libdir}/tulip/libSmallWorldGraph-%{version}.*
+%{_libdir}/tulip/libSpanningDagSelection-%{version}.*
+%{_libdir}/tulip/libSpanningTreeSelection-%{version}.*
+%{_libdir}/tulip/libSquarifiedTreeMap-%{version}.*
+%{_libdir}/tulip/libStrahlerMetric-%{version}.*
+%{_libdir}/tulip/libStrengthClustering-%{version}.*
+%{_libdir}/tulip/libStrengthMetric-%{version}.*
+%{_libdir}/tulip/libStrongComponent-%{version}.*
+%{_libdir}/tulip/libTreeLeaf-%{version}.*
+%{_libdir}/tulip/libTreeRadial-%{version}.*
+%{_libdir}/tulip/libTreeReingoldAndTilforExtended-%{version}.*
+%{_libdir}/tulip/libTutte-%{version}.*
 
 %files -n libtulip-ogl
 %defattr(-,root,root)
-%{_libdir}/libtulip-ogl.so
-%{_libdir}/libtulip-ogl-%{tulip_version}.so*
-%dir %{_libdir}/tlp/glyphs
-%{_libdir}/tlp/glyphs/lib*-%{version}.*
-%{_libdir}/tlp/libFitToLabels-%{version}.*
+%{_libdir}/libtulip-ogl-%{tulip_version}.so
+%dir %{_libdir}/tulip/glyphs
+%{_libdir}/tulip/glyphs/lib*-%{version}.*
+%{_libdir}/tulip/libFitToLabels-%{version}.*
 
 %files -n libtulip-qt4
 %defattr(-,root,root)
-%{_libdir}/libtulip-qt4.so
-%{_libdir}/libtulip-qt4-%{tulip_version}.so*
-%{_libdir}/tlp/libConvolutionClustering-%{version}.*
-%{_libdir}/tlp/libEnumColorValuesMapping-%{version}.*
-%{_libdir}/tlp/libFileSystem-%{version}.*
-%{_libdir}/tlp/libWebImport-%{version}.*
-%dir %{_libdir}/tlp/designer
-%{_libdir}/tlp/designer/lib*.*
-%dir %{_libdir}/tlp/view
-%{_libdir}/tlp/view/libSpreadSheet-%{version}.*
+%{_libdir}/libtulip-qt4-%{tulip_version}.so
+%{_libdir}/tulip/libConvolutionClustering-%{version}.*
+%{_libdir}/tulip/libFileSystem-%{version}.*
+%{_libdir}/tulip/libWebImport-%{version}.*
+%dir %{_libdir}/tulip/view
+%{_libdir}/tulip/view/libSpreadSheet-%{version}.*
 
 %files doc
 %defattr(-,root,root)
-%doc tulip-%{version}-userManual.pdf
+%doc %dir %{_datadir}/tulip/html
+%doc %dir %{_datadir}/tulip/html/common
+%doc %{_datadir}/tulip/html/common
+%doc %dir %{_datadir}/tulip/html/userHandbook
+%doc %{_datadir}/tulip/html/userHandbook
 
 %files devel
 %defattr(-,root,root)
-%{_datadir}/aclocal/tulip.m4
 %dir %{_includedir}/tulip
 %{_includedir}/tulip/*
-%{_includedir}/*.h
+%{_datadir}/tulip/*.cmake
 
 %files devel-doc
 %defattr(-,root,root)
-%doc tulip-%{version}-devHandbook.pdf
+%doc %dir %{_datadir}/tulip/html/doxygen
+%doc %{_datadir}/tulip/html/doxygen
+%doc %dir %{_datadir}/tulip/html/developerHandbook
+%doc %{_datadir}/tulip/html/developerHandbook
 
 %changelog
Index: add-return-to-nonvoid-functions.patch
===================================================================
--- add-return-to-nonvoid-functions.patch (added)
+++ add-return-to-nonvoid-functions.patch (revision 16)
@@ -0,0 +1,38 @@
+diff -wruN -x '*~' ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/common/shapes.cc ./plugins/clustering/Delaunay/poly2tri/common/shapes.cc
+--- ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/common/shapes.cc	2012-02-21 12:23:35.000000000 +0100
++++ ./plugins/clustering/Delaunay/poly2tri/common/shapes.cc	2012-02-22 13:35:03.000000000 +0100
+@@ -164,6 +164,7 @@
+     return 2;
+   }
+   assert(0);
++  return -1;
+ }
+ 
+ int Triangle::EdgeIndex(const Point* p1, const Point* p2)
+@@ -223,6 +224,7 @@
+     return points_[1];
+   }
+   assert(0);
++  return NULL;
+ }
+ 
+ // The point counter-clockwise to given point
+@@ -236,6 +238,7 @@
+     return points_[0];
+   }
+   assert(0);
++  return NULL;
+ }
+ 
+ // The neighbor clockwise to given point
+diff -wruN -x '*~' ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc ./plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc
+--- ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc	2012-02-21 12:23:35.000000000 +0100
++++ ./plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc	2012-02-22 13:07:19.000000000 +0100
+@@ -714,6 +714,7 @@
+     //throw new RuntimeException("[Unsupported] Opposing point on constrained edge");
+     assert(0);
+   }
++  return ep; // just to please GCC
+ }
+ 
+ void Sweep::FlipScanEdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle& flip_triangle,
Index: tulip-3.7.0-html.tar.bz2
===================================================================
Binary files tulip-3.7.0-html.tar.bz2 (revision 16) added
Index: tulip-3.7.0-src.tar.bz2
===================================================================
Binary files tulip-3.7.0-src.tar.bz2 (revision 16) added
Index: tulip-gcc-4.7.patch
===================================================================
--- tulip-gcc-4.7.patch (added)
+++ tulip-gcc-4.7.patch (revision 16)
@@ -0,0 +1,13 @@
+diff -wruN -x '*~' ../orig-tulip-3.7.0-src/library/tulip/src/GraphStorage.cpp ./library/tulip/src/GraphStorage.cpp
+--- ../orig-tulip-3.7.0-src/library/tulip/src/GraphStorage.cpp	2012-02-21 12:23:32.000000000 +0100
++++ ./library/tulip/src/GraphStorage.cpp	2012-05-02 13:50:22.136372474 +0200
+@@ -16,8 +16,8 @@
+  * See the GNU General Public License for more details.
+  *
+  */
+-#include <tulip/GraphStorage.h>
+ #include <tulip/memorypool.h>
++#include <tulip/GraphStorage.h>
+ 
+ using namespace tlp;
+ 
Index: tulip-3.3.1-devHandbook.pdf
===================================================================
Binary files tulip-3.3.1-devHandbook.pdf (revision 39) deleted
Index: tulip-3.3.1-userManual.pdf
===================================================================
Binary files tulip-3.3.1-userManual.pdf (revision 39) deleted
Index: tulip-3.3.1.tar.bz2
===================================================================
Binary files tulip-3.3.1.tar.bz2 (revision 39) deleted
Index: tulip-gcc45.patch
===================================================================
--- tulip-gcc45.patch (revision 39)
+++ tulip-gcc45.patch (deleted)
@@ -1,13 +0,0 @@
-Index: tulip-3.3.1/library/tulip/src/Ordering.cpp
-===================================================================
---- tulip-3.3.1.orig/library/tulip/src/Ordering.cpp
-+++ tulip-3.3.1/library/tulip/src/Ordering.cpp
-@@ -719,7 +719,7 @@ void Ordering::selectAndUpdate(node n) {
-   vector<node> noeuds;
-   vector<Face > faces = vector<Face>();
-   vector<bool> splited;
--  MutableContainer<bool>::MutableContainer on_cont;
-+  MutableContainer<bool> on_cont;
-   node n1;
- 
-   res.push_back(n);

Displaying revisions 61 - 80 of 119

Places

Revisions of tulip

Places