SHA256
1
0
forked from pool/graphviz

- Fix compilation with new guile

- Update to version 2.28.0
    - incremented library api version:
        libcdt, libgraph, libcgraph, libgvpr, libgvc
    - Add gvmap, cluster and gvmap.sh
    - Deprecate dotty; prefer gvedit
    - Add patchwork supporting squarified tree maps
    - Add ordering as a node attribute
    - Fix problems with font resolution
    - Fix problems with text placement
    - Fix twopi to set root attribute
    - Make available layouts and formats available via the API
    - Fix error message system so that an application can capture the messages
    - New attributes and features for sfdp
    - gvgen now allows the user to specify graph name and node name template
    - Make overlap=false denote overlap=prism
    - More efficient xdot library
    - HTML-like labels provide ID
    - Fixed bugs: 1480 1980 2044 2087 2088 2089 2091 2093 2094 
        2095 2101 2102 2103 2104 2112 2113 2118 2128 2129 2139 2149 
        2157 2113 2159 2160 2161 2163
    - Add scale attribute to twopi
    - Add <B>,<I>,<U> to html strings
    - migrated to 2005 version of cdt 

- Update to version 2.28.0
    - incremented library api version:
        libcdt, libgraph, libcgraph, libgvpr, libgvc
    - Add gvmap, cluster and gvmap.sh
    - Deprecate dotty; prefer gvedit

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=28
This commit is contained in:
Ismail Dönmez 2011-09-28 19:14:00 +00:00 committed by Git OBS Bridge
parent 1616ed94bc
commit a9efec4330
15 changed files with 276 additions and 401 deletions

View File

@ -1,99 +0,0 @@
See http://bugs.gentoo.org/339298
Index: graphviz-2.26.3/configure.ac
===================================================================
--- graphviz-2.26.3.orig/configure.ac 2010-01-26 17:00:29.000000000 +0100
+++ graphviz-2.26.3/configure.ac 2011-03-11 13:22:25.525313743 +0100
@@ -464,44 +464,17 @@ AC_REPLACE_FUNCS([strcasecmp strncasecmp
dnl -----------------------------------
dnl libtool ltdl on-demand plugin loading
-m4_ifdef([LT_INIT],
- [ #code that is for Libtool 2.x
-AM_PROG_LIBTOOL
- ],
- [ #code that is for 1.5.x
- ])
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
AC_ARG_ENABLE(ltdl,
[AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])])
if test "x$enable_ltdl" != "xno"; then
AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading])
- AC_LIBTOOL_DLOPEN
-m4_ifdef([LT_INIT],
- [ #code that is for Libtool 2.x
- LT_CONFIG_LTDL_DIR([libltdl])
- LTDL_INIT
- ],
- [ #code that is for 1.5.x
- AC_CONFIG_SUBDIRS([libltdl])
- ])
use_ltdl="Yes"
-
- AC_LIBLTDL_CONVENIENCE
- if test "x$DARWIN9" = "xyes"; then
- LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*"
- fi
else
use_ltdl="No (disabled)"
fi
AM_CONDITIONAL(ENABLE_LTDL, [test "x$enable_ltdl" != "xno"])
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_SUBST(LIBLTDL_LDFLAGS)
-m4_ifdef([LT_INIT],
- [ #code that is for Libtool 2.x
- ],
- [ #code that is for 1.5.x
-AM_PROG_LIBTOOL
- ])
# Checks for libraries.
#AC_CHECK_LIB([ICE], [main])
Index: graphviz-2.26.3/lib/gvc/gvcext.h
===================================================================
--- graphviz-2.26.3.orig/lib/gvc/gvcext.h 2009-07-08 17:14:20.000000000 +0200
+++ graphviz-2.26.3/lib/gvc/gvcext.h 2011-03-11 13:23:13.753417211 +0100
@@ -58,6 +58,7 @@ extern "C" {
typedef struct GVJ_s GVJ_t;
typedef struct GVC_s GVC_t;
+
typedef struct {
const char *name;
void* address;
@@ -80,9 +81,11 @@ __declspec(dllexport) lt_symlist_t lt_pr
#if defined(GVDLL)
__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
#else
+#if !defined(LTDL_H)
extern lt_symlist_t lt_preloaded_symbols[];
#endif
#endif
+#endif
#ifdef __cplusplus
Index: graphviz-2.26.3/lib/gvc/Makefile.am
===================================================================
--- graphviz-2.26.3.orig/lib/gvc/Makefile.am 2009-08-28 21:46:42.000000000 +0200
+++ graphviz-2.26.3/lib/gvc/Makefile.am 2011-03-11 13:22:25.526313858 +0100
@@ -18,7 +18,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/pathplan \
-I$(top_srcdir)/lib/$(GRAPH) \
-I$(top_srcdir)/lib/cdt \
- $(INCLTDL) -I$(top_srcdir)/libltdl \
-DGVLIBDIR=\"$(pkglibdir)\"
if WITH_WIN32
@@ -55,8 +54,7 @@ libgvc_C_la_LIBADD += $(top_builddir)/li
libgvc_C_la_DEPENDENCIES += $(top_builddir)/lib/ortho/libortho_C.la
endif
if ENABLE_LTDL
-libgvc_C_la_LIBADD += $(LIBLTDL) $(LIBLTDL_LDFLAGS)
-libgvc_C_la_DEPENDENCIES += $(LIBLTDL)
+libgvc_C_la_LIBADD += -lltdl
endif
libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae3d24c43ad1af261819ee4b9eeeedc67dd76fe9e7ff3a8994385e4eec1ca13e
size 14857738

3
graphviz-2.28.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
size 19620087

30
graphviz-guile.patch Normal file
View File

@ -0,0 +1,30 @@
--- graphviz-2.28.0/configure.ac.orig 2011-05-17 20:36:04.898079515 +0200
+++ graphviz-2.28.0/configure.ac 2011-05-17 21:16:08.718160002 +0200
@@ -676,7 +676,7 @@
if test "x$GUILE" = "x"; then
use_guile="No (guile not available)"
else
- GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2`
+ GUILE_VERSION=$($GUILE --version | head -1 | sed -e 's/.* \([[0-9.]*]\)$/\1/')
GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
if test $GUILE_VERSION_MAJOR -lt 2; then
@@ -691,12 +691,15 @@
if test "x$GUILE" = "x"; then
use_guile="No (guile is too old)"
else
- GUILE_INCLUDES=
- GUILE_LIBS=
+ GUILE_INCLUDES=$(guile-config compile)
+ GUILE_LIBS=$(guile-config link)
+ save_CPPFLAGS="$CPPFLAGS";
+ CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES";
AC_CHECK_HEADER(libguile.h,,[
use_guile="No (guile header missing)"
GUILE=
])
+ CPPFLAGS="$save_CPPFLAGS";
if test "x$GUILE" != "x"; then
use_guile="Yes"
AC_SUBST(GUILE_INCLUDES)

View File

@ -1,11 +0,0 @@
--- lib/neatogen/neatosplines.c
+++ lib/neatogen/neatosplines.c
@@ -63,6 +63,8 @@
n = n + poly[i]->pn;
}
bar = N_GNEW(n, Pedge_t);
+ if (bar == (Pedge_t *)1)
+ bar = (Pedge_t *)0;
b = 0;
for (i = 0; i < npoly; i++) {
if (i == pp)

View File

@ -1,25 +0,0 @@
Index: tclpkg/gv/Makefile.am
===================================================================
--- tclpkg/gv/Makefile.am.orig 2010-06-18 14:03:09.206918506 +0200
+++ tclpkg/gv/Makefile.am 2010-06-18 15:01:52.630918214 +0200
@@ -120,13 +120,18 @@ gv.cmxa: gv.cmx
ocamlopt -a -o gv.cmxa gv.cmx
gv.a: gv.cmxa
+PERL ?= perl
+PERL_CC = $(shell $(PERL) -MExtUtils::Embed -e ccopts)
+PERL_LD = $(shell $(PERL) -MExtUtils::Embed -e ldopts)
+VENDOR_ARCH = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};')
+
pkgperldir = $(pkglibdir)/perl
PERL_data = gv.pm
nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data)
libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS)
-libgv_perl_la_LDFLAGS = -module -avoid-version
-libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_INCLUDES)
+libgv_perl_la_LDFLAGS = -module -avoid-version $(PERL_LD)
+libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_CC)
$(PERL_data): gv_perl.cpp
gv_perl.cpp: gv.i
$(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i

View File

@ -1,7 +1,7 @@
--- tclpkg/Makefile.am
+++ tclpkg/Makefile.am
@@ -15,9 +15,9 @@
pkgpython25dir = $(pkglibdir)/python25
pkgpython27dir = $(pkglibdir)/python27
pkgRdir = $(pkglibdir)/R
pkgrubydir = $(pkglibdir)/ruby
-pkgtcldir = $(pkglibdir)/tcl

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Wed Sep 28 14:01:13 UTC 2011 - idonmez@suse.com
- Fix compilation with new guile
- Update to version 2.28.0
- incremented library api version:
libcdt, libgraph, libcgraph, libgvpr, libgvc
- Add gvmap, cluster and gvmap.sh
- Deprecate dotty; prefer gvedit
- Add patchwork supporting squarified tree maps
- Add ordering as a node attribute
- Fix problems with font resolution
- Fix problems with text placement
- Fix twopi to set root attribute
- Make available layouts and formats available via the API
- Fix error message system so that an application can capture the messages
- New attributes and features for sfdp
- gvgen now allows the user to specify graph name and node name template
- Make overlap=false denote overlap=prism
- More efficient xdot library
- HTML-like labels provide ID
- Fixed bugs: 1480 1980 2044 2087 2088 2089 2091 2093 2094
2095 2101 2102 2103 2104 2112 2113 2118 2128 2129 2139 2149
2157 2113 2159 2160 2161 2163
- Add scale attribute to twopi
- Add <B>,<I>,<U> to html strings
- migrated to 2005 version of cdt
-------------------------------------------------------------------
Fri Mar 11 12:25:36 UTC 2011 - coolo@novell.com

View File

@ -19,44 +19,67 @@
%define mname graphviz
Name: graphviz-plugins
BuildRequires: gd-devel libexpat-devel libjpeg-devel libpng-devel swig zlib-devel
BuildRequires: freetype2-devel >= 2 gcc-c++ ksh libstdc++-devel
BuildRequires: bison flex glib2-devel m4 perl python-devel tk-devel >= 8.3 xorg-x11-devel
BuildRequires: php5-devel ruby-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
BuildRequires: cairo-devel gcc-java gmp-devel guile-devel libgcj-devel lua-devel mono-core ocaml pango-devel
BuildRequires: ghostscript-mini graphviz gtkglext-devel libglade2-devel libgnomeui-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype2-devel >= 2
BuildRequires: gcc-c++
BuildRequires: gcc-java
BuildRequires: gd-devel
BuildRequires: ghostscript-mini
BuildRequires: gmp-devel
BuildRequires: graphviz
BuildRequires: gtkglext-devel
BuildRequires: guile-devel
BuildRequires: ksh
BuildRequires: libexpat-devel
BuildRequires: libgcj-devel
BuildRequires: libgnomeui-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: lua-devel
BuildRequires: m4
BuildRequires: mono-core
BuildRequires: ocaml
BuildRequires: perl
BuildRequires: php5-devel
BuildRequires: python-devel
BuildRequires: ruby-devel
BuildRequires: swig
BuildRequires: tk-devel >= 8.3
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-libICE-devel
BuildRequires: xorg-x11-libSM-devel
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
BuildRequires: xorg-x11-libXmu-devel
BuildRequires: xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libXt-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libglade-2.0)
BuildRequires: pkgconfig(pango)
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
Version: 2.26.3
Release: 9
AutoReqProv: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.bz2
#Source1: %{name}-rpmlintrc
Patch0: graphviz-fix-pkgIndex.patch
Patch3: graphviz-neato_splines.patch
Patch11: graphviz-2.20.2-interpreter_names.patch
Patch13: graphviz-stddefs.patch
Patch14: graphviz-gd_png_check_sig.patch
Patch15: graphviz-wrong_index.patch
Patch16: graphviz-sequence_point.patch
# PATCH-UPSTREAM see http://bugs.gentoo.org/339298
Patch17: graphviz-2.26.3-libtool24.patch
#Patches above 100 are graphviz-plugins specific.
Patch100: graphviz-plugins-fix_install_dirs.patch
Patch101: graphviz-plugins-tcl_install_dir.patch
Patch103: graphviz-2.18-do_not_use_ocamlopt.patch
Patch104: python-version.diff
Patch105: graphviz-ruby-ppc.patch
Patch106: graphviz-perl-set_rpath.patch
Url: http://www.graphviz.org/
Version: 2.28.0
Release: 1
License: IBM Public License ..
Prefix: /usr
Summary: Graph Visualization Tools
Url: http://www.graphviz.org/
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
Patch1: graphviz-gd_png_check_sig.patch
Patch100: graphviz-plugins-fix_install_dirs.patch
Patch101: python-version.diff
Patch102: graphviz-plugins-tcl_install_dir.patch
Patch103: graphviz-2.20.2-interpreter_names.patch
Patch104: graphviz-guile.patch
Patch105: graphviz-2.18-do_not_use_ocamlopt.patch
Requires(pre): coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: coreutils
Prefix: /usr
%define rb_libdir %{_libdir}/ruby
%define rb_sitedir %{rb_libdir}/site_ruby/%{rb_ver}
%define rb_vendordir %{rb_libdir}/vendor_ruby/%{rb_ver}
@ -69,23 +92,24 @@ of graphs (as in nodes and edges, not as in bar charts).
%package -n graphviz-gnome
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Graphviz plugins that use gtk/GNOME
PreReq: graphviz = %{version}
PreReq: coreutils
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires(pre): coreutils
Requires(pre): graphviz = %{version}
Requires: xorg-x11-fonts
Provides: graphviz_plugin = %{version}
%description -n graphviz-gnome
Graphviz plugins that use gtk/GNOME.
%package -n graphviz-gd
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Graphviz plugin for renderers based on gd
PreReq: graphviz = %{version} gd
PreReq: coreutils
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires(pre): coreutils
Requires(pre): gd
Requires(pre): graphviz = %{version}
Provides: graphviz_plugin = %{version}
%description -n graphviz-gd
The graphviz-gd package contains the gd extensions for the graphviz
@ -93,10 +117,11 @@ tools.
%package -n graphviz-guile
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Graph Visualization Tools
Requires: graphviz = %{version} guile
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: guile
Provides: graphviz_plugin = %{version}
%description -n graphviz-guile
A collection of tools and tcl packages for the manipulation and layout
@ -104,10 +129,11 @@ of graphs (as in nodes and edges, not as in bar charts).
%package -n graphviz-java
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Graph Visualization Tools
Requires: graphviz = %{version} java
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: java
Provides: graphviz_plugin = %{version}
%description -n graphviz-java
A collection of tools and tcl packages for the manipulation and layout
@ -115,10 +141,11 @@ of graphs (as in nodes and edges, not as in bar charts).
%package -n graphviz-lua
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Lua extension for graphviz
Requires: graphviz = %{version} lua
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: lua
Provides: graphviz_plugin = %{version}
%description -n graphviz-lua
The graphviz-lua package contains the lua extension for the graphviz
@ -126,10 +153,11 @@ tools.
%package -n graphviz-ocaml
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: OCAML extension for graphviz
Requires: graphviz = %{version} ocaml
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: ocaml
Provides: graphviz_plugin = %{version}
%description -n graphviz-ocaml
The graphviz-ocaml package contains the Objective Caml extension for
@ -137,11 +165,11 @@ the graphviz tools.
%package -n graphviz-perl
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Perl extension for Graphviz
Requires: graphviz = %{version}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: perl = %{perl_version}
Provides: graphviz_plugin = %{version}-%{release}
Provides: graphviz_plugin = %{version}
%description -n graphviz-perl
The graphviz-perl package contains the Perl extension for the graphviz
@ -149,10 +177,11 @@ tools.
%package -n graphviz-php
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: PHP Extension for Graphviz
Requires: graphviz = %{version} php5
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: php5
Provides: graphviz_plugin = %{version}
%description -n graphviz-php
The graphviz-php package contains the PHP extension for the graphviz
@ -160,10 +189,11 @@ tools.
%package -n graphviz-python
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Python Extension for Graphviz
Requires: graphviz = %{version} python
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: python
Provides: graphviz_plugin = %{version}
%description -n graphviz-python
The graphviz-python package contains the Python extension for the
@ -171,10 +201,11 @@ graphviz tools.
%package -n graphviz-ruby
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Ruby Extension for Graphviz
Requires: graphviz = %{version} ruby
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: ruby
Provides: graphviz_plugin = %{version}
%description -n graphviz-ruby
The graphviz-ruby package contains the ruby extension for the graphviz
@ -182,10 +213,11 @@ tools.
%package -n graphviz-sharp
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: C# Extension for Graphviz
Requires: graphviz = %{version} mono-core
Provides: graphviz_plugin = %{version}-%{release}
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: mono-core
Provides: graphviz_plugin = %{version}
%description -n graphviz-sharp
The graphviz-sharp package contains the C# extension for the graphviz
@ -193,10 +225,12 @@ tools.
%package -n graphviz-tcl
License: IBM Public License ..
Group: Development/Libraries/Tcl
Summary: Tcl extension tools for graphviz
Requires: graphviz = %{version} tcl >= 8.3 tk
Provides: graphviz_plugin = %{version}-%{release}
Group: Development/Libraries/Tcl
Requires: graphviz = %{version}
Requires: tcl >= 8.3
Requires: tk
Provides: graphviz_plugin = %{version}
%description -n graphviz-tcl
The graphviz-tcl package contains the various tcl packages (extensions)
@ -204,47 +238,36 @@ for the graphviz tools.
%package -n graphviz-doc
License: IBM Public License ..
Group: Productivity/Graphics/Visualization/Graph
Summary: Documentation for graphviz
Group: Productivity/Graphics/Visualization/Graph
%description -n graphviz-doc
Provides some additional PDF and HTML documentation for graphviz.
%prep
%setup -q -n %{mname}-%{version}
%patch0
%patch3
%patch11
%patch13
%patch14
%patch15
%patch16
%patch17 -p1
%patch1
%patch100
%patch101
%patch102
%patch103
%patch104
%patch105 -p1
%patch106
%patch104 -p1
%patch105
# Fix path in generated man pages
sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl
# remove broken macros
rm m4/iconv.m4 m4/lib-*.m4
cp /usr/share/gettext/config.rpath config
%build
./autogen.sh
touch tclpkg/gv/gv.i
autoreconf
WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith"
CFLAGS="$RPM_OPT_FLAGS $WARN_FLAGS"
CFLAGS="%{optflags} $WARN_FLAGS"
%ifarch %ix86 x86_64
CFLAGS="$CFLAGS -ffast-math"
%endif
CC=gcc
RANLIB=:
export CC RANLIB
export CFLAGS="$CFLAGS"
export CPPFLAGS="%optflags"
export CFLAGS
export CXXFLAGS="$CXXFLAGS -fpermissive"
export CPPFLAGS="%{optflags}"
%configure \
--with-x \
--disable-static \
@ -253,13 +276,13 @@ export CPPFLAGS="%optflags"
--without-ming \
--enable-ltdl-install=no \
--disable-io
%{__make} DESTDIR=%buildroot %{?jobs:-j%jobs}
make DESTDIR=%{buildroot} %{?_smp_mflags}
%install
%makeinstall \
docdir=%{buildroot}%{_docdir}/%{mname} \
pkgconfigdir=%{_libdir}/pkgconfig
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
mkdir -p %{buildroot}/%{_docdir}
mkdir -p %{buildroot}%{_datadir}/%{mname}
mkdir -p %{buildroot}%{_datadir}/tcl/%{mname}
@ -272,8 +295,8 @@ touch %{buildroot}%{_libdir}/graphviz/config
for manfile in $(find %{buildroot} -name \*.man); do
sed -e 's$/usr/lib/graphviz$%{_libdir}/%{mname}$g' $manfile > ${manfile}.new && mv ${manfile}.new ${manfile}
done
rm -f %{buildroot}/usr/bin/*
rm -rf %{buildroot}/usr/include/graphviz
rm -f %{buildroot}%{_bindir}/*
rm -rf %{buildroot}%{_includedir}/graphviz
rm -f %{buildroot}%{_libdir}/graphviz/config
rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_core*
rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_dot_layout*
@ -295,7 +318,7 @@ done
%endif
#%clean
#rm -rf %{buildroot}
%{__rm} -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
%files -n graphviz-gd
%defattr(-,root,root)

View File

@ -1,26 +0,0 @@
Index: graphviz-2.26.3/configure.ac
===================================================================
--- graphviz-2.26.3.orig/configure.ac
+++ graphviz-2.26.3/configure.ac
@@ -1405,8 +1405,6 @@ else
use_ruby="No (ruby not available)"
else
RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
- # hack for powerpc-darwin8 (10.4)
- RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
save_CPPFLAGS=$CPPFLAGS
Index: graphviz-2.26.3/configure
===================================================================
--- graphviz-2.26.3.orig/configure
+++ graphviz-2.26.3/configure
@@ -27575,8 +27575,6 @@ fi
use_ruby="No (ruby not available)"
else
RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
- # hack for powerpc-darwin8 (10.4)
- RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`"
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
save_CPPFLAGS=$CPPFLAGS

View File

@ -1,13 +0,0 @@
Index: lib/sfio/sfhdr.h
===================================================================
--- lib/sfio/sfhdr.h.orig 2009-06-03 03:10:55.000000000 +0200
+++ lib/sfio/sfhdr.h 2010-06-10 18:27:21.482363490 +0200
@@ -732,7 +732,7 @@ extern "C" {
#define _SFOPENWR(f) ((f)->endw = ((f)->flags&(SF_MTSAFE|SF_LINE)) ? (f)->data : (f)->endb)
#define _SFOPEN(f) ((f)->mode == SF_READ ? _SFOPENRD(f) : \
(f)->mode == SF_WRITE ? _SFOPENWR(f) : \
- ((f)->endr = (f)->endr = (f)->data) )
+ ((f)->endr = (f)->endw = (f)->data) )
#define SFOPEN(f,l) (void)((l) ? 0 : \
((f)->mode &= ~(SF_LOCK|SF_RC|SF_RV), _SFOPEN(f), 0) )

View File

@ -1,31 +0,0 @@
--- lib/sfio/sftable.c
+++ lib/sfio/sftable.c
@@ -14,6 +14,8 @@
* AT&T Research, Florham Park NJ *
**********************************************************/
+#include <stddef.h>
+
#include "sfhdr.h"
/* Dealing with $ argument addressing stuffs.
--- lib/sfio/sfvprintf.c
+++ lib/sfio/sfvprintf.c
@@ -14,6 +14,7 @@
* AT&T Research, Florham Park NJ *
**********************************************************/
+#include <stddef.h>
#include "sfhdr.h"
/* The engine for formatting data
--- lib/sfio/sfvscanf.c
+++ lib/sfio/sfvscanf.c
@@ -14,6 +14,7 @@
* AT&T Research, Florham Park NJ *
**********************************************************/
+#include <stddef.h>
#include "sfhdr.h"
/* The main engine for reading formatted data

View File

@ -1,19 +0,0 @@
The second argument to the typeName function should be the ID of
a type, not a value. As typeName does no checking on it's arguments
it'll form a negative index for accessing the type names array.
Patch by Emden R. Gansner <erg@research.att.com>
Index: lib/gvpr/compile.c
===================================================================
--- lib/gvpr/compile.c.orig 2009-11-22 20:10:33.000000000 +0100
+++ lib/gvpr/compile.c 2010-06-01 12:52:04.902610547 +0200
@@ -1514,7 +1514,7 @@ setval(Expr_t * pgm, Exnode_t * x, Exid_
state->tvt = (trav_type) iv;
else
error(1, "unexpected value %d assigned to %s : ignored",
- iv, typeName(pgm, V_travtype));
+ iv, typeName(pgm, T_tvtyp));
break;
case V_travroot:
np = INT2PTR(Agnode_t *, v.integer);

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Sep 28 19:08:30 UTC 2011 - idonmez@suse.com
- Update to version 2.28.0
- incremented library api version:
libcdt, libgraph, libcgraph, libgvpr, libgvc
- Add gvmap, cluster and gvmap.sh
- Deprecate dotty; prefer gvedit
- Add patchwork supporting squarified tree maps
- Add ordering as a node attribute
- Fix problems with font resolution
- Fix problems with text placement
- Fix twopi to set root attribute
- Make available layouts and formats available via the API
- Fix error message system so that an application can capture the messages
- New attributes and features for sfdp
- gvgen now allows the user to specify graph name and node name template
- Make overlap=false denote overlap=prism
- More efficient xdot library
- HTML-like labels provide ID
- Fixed bugs: 1480 1980 2044 2087 2088 2089 2091 2093 2094
2095 2101 2102 2103 2104 2112 2113 2118 2128 2129 2139 2149
2157 2113 2159 2160 2161 2163
- Add scale attribute to twopi
- Add <B>,<I>,<U> to html strings
- migrated to 2005 version of cdt
-------------------------------------------------------------------
Fri Mar 11 12:25:36 UTC 2011 - coolo@novell.com

View File

@ -20,37 +20,41 @@
%define config_file config6
Name: graphviz
BuildRequires: fdupes libexpat-devel libjpeg-devel libpng-devel zlib-devel
BuildRequires: freetype2-devel >= 2
BuildRequires: gcc-c++ libstdc++-devel
BuildRequires: bison flex glib2-devel xorg-x11-devel
BuildRequires: xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
BuildRequires: libtool
PreReq: /bin/rm
Version: 2.26.3
Release: 12
AutoReqProv: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.bz2
Source2: graphviz-rpmlintrc
Patch0: graphviz-fix-pkgIndex.patch
Patch3: graphviz-neato_splines.patch
Patch11: graphviz-2.20.2-interpreter_names.patch
Patch13: graphviz-stddefs.patch
Patch14: graphviz-gd_png_check_sig.patch
Patch15: graphviz-wrong_index.patch
Patch16: graphviz-sequence_point.patch
# PATCH-UPSTREAM see http://bugs.gentoo.org/339298
Patch17: graphviz-2.26.3-libtool24.patch
Url: http://www.graphviz.org/
Version: 2.28.0
Release: 1
License: IBM Public License ..
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /bin/cat
Recommends: graphviz-gnome = %{version}
Summary: Graph Visualization Tools
Url: http://www.graphviz.org/
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
Source2: graphviz-rpmlintrc
Patch1: graphviz-gd_png_check_sig.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: freetype2-devel >= 2
BuildRequires: gcc-c++
BuildRequires: libexpat-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-libICE-devel
BuildRequires: xorg-x11-libSM-devel
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
BuildRequires: xorg-x11-libXmu-devel
BuildRequires: xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libXt-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(glib-2.0)
Requires(pre): /bin/cat
Requires(pre): /bin/rm
Recommends: graphviz-gd = %{version}
Recommends: graphviz-gnome = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr
%description
A collection of tools and tcl packages for the manipulation and layout
@ -58,12 +62,21 @@ of graphs (as in nodes and edges, not as in bar charts).
%package devel
License: IBM Public License ..
Group: Development/Libraries/C and C++
Summary: Graphiviz development package
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: glibc-devel tcl-devel fontconfig-devel expat freetype2-devel
Requires: libjpeg-devel libpng-devel zlib-devel libtool perl
Requires: libstdc++-devel tk-devel
Requires: expat
Requires: fontconfig-devel
Requires: freetype2-devel
Requires: glibc-devel
Requires: libjpeg-devel
Requires: libpng-devel
Requires: libstdc++-devel
Requires: libtool
Requires: perl
Requires: tcl-devel
Requires: tk-devel
Requires: zlib-devel
%description devel
The graphviz-devel package contains all that's necessary for developing
@ -74,66 +87,52 @@ Note: If you need output in png format you also need to install
%prep
%setup -q
%patch0
%patch3
%patch11
%patch13
%patch14
%patch15
%patch16
%patch17 -p1
%patch1
# Fix path in generated man pages
sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl
# remove broken macros
rm m4/iconv.m4 m4/lib-*.m4
cp /usr/share/gettext/config.rpath config
%build
./autogen.sh
touch tclpkg/gv/gv.i
WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith"
CFLAGS="$RPM_OPT_FLAGS $WARN_FLAGS"
CFLAGS="%{optflags} $WARN_FLAGS"
%ifarch %ix86 x86_64
CFLAGS="$CFLAGS -ffast-math"
%endif
CC=gcc
RANLIB=:
export CC RANLIB
export CFLAGS="$CFLAGS"
export CPPFLAGS="%optflags"
./configure \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--libdir=%{_libdir} \
--includedir=%{_includedir} \
--datadir=%{_datadir} \
--mandir=%{_mandir} \
export CPPFLAGS="%{optflags}"
%configure \
--with-x \
--with-mylibgd \
--disable-static \
--disable-dependency-tracking \
--enable-ltdl-install=no \
--with-ipsepcola \
--without-ming \
--disable-io
make %{?jobs:-j%jobs} DESTDIR=%buildroot
make %{?_smp_mflags} DESTDIR=%{buildroot}
%install
make install \
DESTDIR=%{buildroot} \
docdir=%{buildroot}%{_docdir}/%{name} \
pkgconfigdir=%{_libdir}/pkgconfig
find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f
mkdir -p %{buildroot}/%{_docdir}
mkdir -p %{buildroot}%{_datadir}/%{name}
rm -f %buildroot/%{_libdir}/%{name}/pkgIndex.tcl
rm -f %{buildroot}/%{_libdir}/%{name}/pkgIndex.tcl
chmod -x %{buildroot}%{_datadir}/%{name}/lefty/*
cp -a %{buildroot}%{_datadir}/%{name}/doc __doc
rm -rf %{buildroot}%{_datadir}/%{name}/doc
mkdir -p %{buildroot}%{_libdir}/graphviz
touch %{buildroot}%{_libdir}/graphviz/config
mkdir -p %{buildroot}/etc/ld.so.conf.d/
cat <<EOF >%{buildroot}/etc/ld.so.conf.d/%{name}.conf
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
cat <<EOF >%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
%{_libdir}/%{name}
%{_libdir}/%{name}/sharp
%{_libdir}/%{name}/java
@ -146,6 +145,7 @@ cat <<EOF >%{buildroot}/etc/ld.so.conf.d/%{name}.conf
%{_libdir}/%{name}/guile
%{_libdir}/%{name}/ruby
EOF
#Correct the path to the shared library
for manfile in $(find %{buildroot} -name \*.man); do
sed -e 's$/usr/lib/graphviz$%{_libdir}/%{name}$g' $manfile > ${manfile}.new && mv ${manfile}.new ${manfile}
@ -154,12 +154,10 @@ rm -f %{buildroot}%{_libdir}/graphviz/libgvplugin_gd.*
rm -f %{_libdir}/graphviz/libgvplugin_pango*
rm -f %{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
rm -f %{_libdir}/graphviz/libgvplugin_gtk*
#%clean
#rm -rf %buildroot
%post
/sbin/ldconfig
# run "dot -c" to generate plugin config %_libdir/graphviz/config
# run "dot -c" to generate plugin config %{_libdir}/graphviz/config
dot -c
test -s %{_libdir}/graphviz/%{config_file} || echo "%{_libdir}/graphviz/%{config_file} doesn't exist! Check installation."
@ -179,15 +177,8 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%dir %{_libdir}/%{name}
%{_libdir}/*.so.*
%{_libdir}/graphviz/*.so*
#%{_libdir}/graphviz/libgvplugin_core*
#%{_libdir}/graphviz/libgvplugin_dot_layout*
#%{_libdir}/graphviz/libgvplugin_neato_layout*
#%{_libdir}/graphviz/libgvplugin_xlib*
/etc/ld.so.conf.d/graphviz.conf
%{_sysconfdir}/ld.so.conf.d/graphviz.conf
%ghost %{_libdir}/graphviz/config
#%exclude %{_libdir}/graphviz/libgvplugin_pango*
#%exclude %{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
#%exclude %{_libdir}/graphviz/libgvplugin_gtk*
%files devel
%defattr(-,root,root)