rpm/graphviz
SHA256
1
0
Fork 0
forked from pool/graphviz
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=7

Browse Source
This commit is contained in:
OBS User unknown 2007-06-07 11:14:12 +00:00 committed by Git OBS Bridge
parent 25c552eb14
commit 353abf2300
7 changed files with 344 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
graphviz-config-file-option.patch
View File

@ -1,42 +0,0 @@
From: Andreas Gruenbacher <agruen@suse.de>
Subject: Add a -C option to specify an alternative config file
Add this patch without applying it for now; we need additional
changes before the config file can be created in the build
system without being root.
Index: graphviz-2.6/lib/common/args.c
===================================================================
--- graphviz-2.6.orig/lib/common/args.c
+++ graphviz-2.6/lib/common/args.c
@@ -122,6 +122,16 @@ config_extra_args(GVC_t *gvc, int argc,
if (arg && *arg == '-') {
switch (arg[1]) {
case 'c' : Config = TRUE; break;
+ case 'C' :
+ if (!arg[2]) {
+ fprintf (stderr, "No argument for -C flag\n");
+ dotneato_usage (1);
+ }
+ if (gvc->config_path)
+ free(gvc->config_path);
+ gvc->config_path = gmalloc(strlen(arg+1) + 1);
+ strcpy(gvc->config_path, arg+1);
+ break;
default :
cnt++;
if (*p != arg) *p = arg;
Index: graphviz-2.6/lib/common/input.c
===================================================================
--- graphviz-2.6.orig/lib/common/input.c
+++ graphviz-2.6/lib/common/input.c
@@ -64,7 +64,8 @@ static char *memtestItems = "\n\
static char *configFlags = "(additional options for config) [-c]\n";
static char *configItems = "\n\
-c - Configure plugins (Writes $prefix/lib/graphviz/config \n\
- with available plugin information. Needs write priviledge.)\n";
+ with available plugin information. Needs write priviledge.)\n\
+ -C file - Use an alternative config file.\n";
void dotneato_usage(int exval)
{

34
graphviz-new_X_paths.patch
View File

@ -1,34 +0,0 @@
--- configure.ac
+++ configure.ac
@@ -91,7 +91,7 @@
AC_DEFINE_UNQUOTED(DARWIN_DYLIB,"$DARWIN_DYLIB",[Define for Darwin-style shared library names.])
;;
* ) # This sucks! Whatever happened to standards for file system layout?
- DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+ DEFAULT_FONTPATH="/usr/share/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/fonts/Type1:/usr/common/share/fonts/ttf";
PATHSEPARATOR=":"
;;
esac
--- doc/FAQ.html
+++ doc/FAQ.html
@@ -691,7 +691,8 @@
<P>
The default DOTFONTPATH is:
<pre>
-#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1"
+#define DEFAULT_FONTPATH
+"/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/share/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/fonts/Type1"
</pre>
If your fonts are somewhere else, then you must set that directory in
the webdot script, or recompile Graphviz with the correct DEFAULT_FONTPATH
--- lib/gd/gd.h
+++ lib/gd/gd.h
@@ -59,7 +59,7 @@
/* 2.0.23: more Type 1 fonts */
#ifndef DEFAULT_FONTPATH
/* default fontpath for unix systems - whatever happened to standards ! */
-#define DEFAULT_FONTPATH "/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1"
+#define DEFAULT_FONTPATH "/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/share/fonts/TTF:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/fonts/Type1:/usr/openwin/lib/X11/fonts/Type1"
#endif
#ifndef PATHSEPARATOR
#define PATHSEPARATOR ":"

307
graphviz-no_plugin_versions.patch Normal file
View File

@ -0,0 +1,307 @@
--- lib/agraph/Makefile.am
+++ lib/agraph/Makefile.am
@@ -20,7 +20,7 @@
mem.c node.c obj.c pend.c rec.c refstr.c scan.l subg.c \
utils.c write.c
-libagraph_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libagraph_la_LDFLAGS = -module -avoid-version -no-undefined
libagraph_la_SOURCES = $(libagraph_C_la_SOURCES)
libagraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la
--- lib/cdt/Makefile.am
+++ lib/cdt/Makefile.am
@@ -19,7 +19,7 @@
dthash.c dtlist.c dtmethod.c dtopen.c dtrenew.c dtrestore.c dtsize.c \
dtstat.c dtstrhash.c dttree.c dtview.c dtwalk.c
-libcdt_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libcdt_la_LDFLAGS = -module -avoid-version -no-undefined
libcdt_la_SOURCES = $(libcdt_C_la_SOURCES)
.3.pdf:
--- lib/dotgen/Makefile.am
+++ lib/dotgen/Makefile.am
@@ -12,7 +12,7 @@
noinst_HEADERS = dot.h dotprocs.h
noinst_LTLIBRARIES = libdotgen_C.la
-libdotgen_C_la_LDFLAGS = -no-undefined
+libdotgen_C_la_LDFLAGS = -module -avoid-version -no-undefined
libdotgen_C_la_SOURCES = acyclic.c class1.c class2.c cluster.c compound.c \
conc.c decomp.c fastgr.c flat.c dotinit.c mincross.c \
position.c rank.c sameport.c dotsplines.c
--- lib/expr/Makefile.am
+++ lib/expr/Makefile.am
@@ -32,7 +32,7 @@
$(top_builddir)/lib/vmalloc/libvmalloc_C.la \
$(top_builddir)/lib/sfio/libsfio_C.la
-libexpr_la_LDFLAGS = -version-info @VERSION_INFO@
+libexpr_la_LDFLAGS = -module -avoid-version
libexpr_la_SOURCES = $(libexpr_C_la_SOURCES)
libexpr_la_LIBADD = $(libexpr_C_la_LIBADD)
$(top_builddir)/lib/cdt/libcdt.la
--- lib/graph/Makefile.am
+++ lib/graph/Makefile.am
@@ -19,7 +19,7 @@
attribs.c agxbuf.c edge.c graph.c graphio.c lexer.c \
node.c parser.y refstr.c trie.c
-libgraph_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgraph_la_LDFLAGS = -module -avoid-version -no-undefined
libgraph_la_SOURCES = $(libgraph_C_la_SOURCES)
libgraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la
--- lib/pathplan/Makefile.am
+++ lib/pathplan/Makefile.am
@@ -15,7 +15,7 @@
libpathplan_C_la_SOURCES = cvt.c inpoly.c route.c shortest.c \
shortestpth.c solvers.c triang.c util.c visibility.c
-libpathplan_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libpathplan_la_LDFLAGS = -module -avoid-version -no-undefined
libpathplan_la_SOURCES = $(libpathplan_C_la_SOURCES)
libpathplan_la_LIBADD = @MATH_LIBS@
--- plugin/core/Makefile.am
+++ plugin/core/Makefile.am
@@ -24,7 +24,7 @@
gvrender_core_map.c \
gvloadimage_core.c
-libgvplugin_core_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_core_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
libgvplugin_core_la_LIBADD =
--- plugin/dot_layout/Makefile.am
+++ plugin/dot_layout/Makefile.am
@@ -20,7 +20,7 @@
libgvplugin_dot_layout_C_la_LIBADD = \
$(top_builddir)/lib/dotgen/libdotgen_C.la
-libgvplugin_dot_layout_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_dot_layout_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
$(top_builddir)/lib/gvc/libgvc.la \
--- plugin/gd/Makefile.am
+++ plugin/gd/Makefile.am
@@ -21,7 +21,7 @@
gvtextlayout_gd.c \
gvloadimage_gd.c
-libgvplugin_gd_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_gd_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES)
if WITH_MYLIBGD
libgvplugin_gd_la_LIBADD = \
--- plugin/gtk/Makefile.am
+++ plugin/gtk/Makefile.am
@@ -25,7 +25,7 @@
interface.c \
callbacks.c
-libgvplugin_gtk_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_gtk_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) $(GNOMEUI_LIBS)
--- plugin/ming/Makefile.am
+++ plugin/ming/Makefile.am
@@ -20,7 +20,7 @@
gvplugin_ming.c \
gvrender_ming.c
-libgvplugin_ming_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_ming_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_ming_la_SOURCES = $(libgvplugin_ming_C_la_SOURCES)
libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@
--- plugin/neato_layout/Makefile.am
+++ plugin/neato_layout/Makefile.am
@@ -23,7 +23,7 @@
$(top_builddir)/lib/fdpgen/libfdpgen_C.la \
$(top_builddir)/lib/circogen/libcircogen_C.la
-libgvplugin_neato_layout_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
+libgvplugin_neato_layout_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
$(top_builddir)/lib/gvc/libgvc.la \
--- plugin/pango/Makefile.am
+++ plugin/pango/Makefile.am
@@ -20,7 +20,7 @@
gvtextlayout_pango.c \
gvloadimage_pango.c
-libgvplugin_pango_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_pango_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_pango_la_SOURCES = $(libgvplugin_pango_C_la_SOURCES)
libgvplugin_pango_la_LIBADD = @PANGOCAIRO_LIBS@ @MATH_LIBS@
--- plugin/xlib/Makefile.am
+++ plugin/xlib/Makefile.am
@@ -21,6 +21,6 @@
gvplugin_xlib.c \
gvdevice_xlib.c
-libgvplugin_xlib_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvplugin_xlib_la_LDFLAGS = -module -avoid-version -no-undefined
libgvplugin_xlib_la_SOURCES = $(libgvplugin_xlib_C_la_SOURCES)
libgvplugin_xlib_la_LIBADD = @PANGOCAIRO_LIBS@ @X_LIBS@ -lX11 @SOCKET_LIBS@ @MATH_LIBS@
--- tclpkg/gdtclft/Makefile.am
+++ tclpkg/gdtclft/Makefile.am
@@ -28,7 +28,7 @@
libgdtclft_la_SOURCES = gdtclft.c
-libgdtclft_la_LDFLAGS = -no-undefined
+libgdtclft_la_LDFLAGS = -module -avoid-version -no-undefined
if WITH_LIBGD
if WITH_MYLIBGD
--- tclpkg/gv/Makefile.am
+++ tclpkg/gv/Makefile.am
@@ -19,7 +19,7 @@
nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_hdr)
libgv_sharp_la_SOURCES = $(BASESOURCES)
libgv_sharp_la_LIBADD = $(BASELIBS) @SHARP_LIBS@
-libgv_sharp_la_LDFLAGS =
+libgv_sharp_la_LDFLAGS = -module -avoid-version
gv_sharp.cpp $(SHARP_hdr): gv.i
$(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp $(srcdir)/gv.i
@@ -28,7 +28,7 @@
nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_hdr)
libgv_guile_la_SOURCES = $(BASESOURCES)
libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
-libgv_guile_la_LDFLAGS =
+libgv_guile_la_LDFLAGS = -module -avoid-version
gv_guile.cpp $(GUILE_hdr): gv.i
$(SWIG) -c++ -guile -o gv_guile.cpp $(srcdir)/gv.i
$(SED) -e 's/SWIG_GUILE_INIT_STATIC void/void/' <gv_guile.cpp >t
@@ -39,7 +39,7 @@
nodist_libgv_io_la_SOURCES = gv_io.cpp $(IO_hdr)
libgv_io_la_SOURCES = $(BASESOURCES)
libgv_io_la_LIBADD = $(BASELIBS) @IO_LIBS@
-libgv_io_la_LDFLAGS =
+libgv_io_la_LDFLAGS = -module -avoid-version
gv_io.cpp $(IO_hdr): gv.i
$(SWIG) -c++ -io -o gv_io.cpp $(srcdir)/gv.i
@@ -48,7 +48,7 @@
nodist_libgv_java_la_SOURCES = gv_java.cpp
libgv_java_la_SOURCES = $(BASESOURCES)
libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
-libgv_java_la_LDFLAGS =
+libgv_java_la_LDFLAGS = -module -avoid-version
gv_java.cpp $(JAVA_hdr): gv.i
$(SWIG) -c++ -java -o gv_java.cpp $(srcdir)/gv.i
@@ -59,7 +59,7 @@
#libgv_lua_la_CFLAGS = -fno-strict-aliasing
libgv_lua_la_CXXFLAGS = -fno-strict-aliasing
libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
-libgv_lua_la_LDFLAGS =
+libgv_lua_la_LDFLAGS = -module -avoid-version
gv_lua.cpp $(LUA_hdr): gv.i
$(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i
@@ -68,7 +68,7 @@
nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_hdr)
libgv_ocaml_la_SOURCES = $(BASESOURCES)
libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
-libgv_ocaml_la_LDFLAGS =
+libgv_ocaml_la_LDFLAGS = -module -avoid-version
gv_ocaml.cpp $(OCAML_hdr): gv.i
$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
@@ -79,7 +79,7 @@
#libgv_perl_la_CFLAGS = -fno-strict-aliasing
libgv_perl_la_CXXFLAGS = -fno-strict-aliasing
libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
-libgv_perl_la_LDFLAGS =
+libgv_perl_la_LDFLAGS = -module -avoid-version
gv_perl.cpp $(PERL_hdr): gv.i
$(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i
@@ -88,7 +88,7 @@
nodist_libgv_php_la_SOURCES = gv_php.cpp $(PHP_hdr)
libgv_php_la_SOURCES = $(BASESOURCES)
libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
-libgv_php_la_LDFLAGS =
+libgv_php_la_LDFLAGS = -module -avoid-version
gv_php.cpp $(PHP_hdr): gv.i
$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
@@ -97,7 +97,7 @@
nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_hdr)
libgv_python_la_SOURCES = $(BASESOURCES)
libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
-libgv_python_la_LDFLAGS =
+libgv_python_la_LDFLAGS = -module -avoid-version
gv_python.cpp $(PYTHON_hdr): gv.i
$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
@@ -106,7 +106,7 @@
nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_hdr)
libgv_ruby_la_SOURCES = $(BASESOURCES)
libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
-libgv_ruby_la_LDFLAGS =
+libgv_ruby_la_LDFLAGS = -module -avoid-version
gv_ruby.cpp $(RUBY_hdr): gv.i
$(SWIG) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i
@@ -115,7 +115,7 @@
nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_hdr)
libgv_tcl_la_SOURCES = $(BASESOURCES)
libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@
-libgv_tcl_la_LDFLAGS =
+libgv_tcl_la_LDFLAGS = -module -avoid-version
gv_tcl.cpp $(TCL_hdr): gv.i
$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
--- tclpkg/tcldot/Makefile.am
+++ tclpkg/tcldot/Makefile.am
@@ -42,7 +42,7 @@
endif
libtcldot_la_SOURCES = tcldot.c $(CODEGENS) $(GDTCLFT)
-libtcldot_la_LDFLAGS = -no-undefined
+libtcldot_la_LDFLAGS = -module -avoid-version -no-undefined
if WITH_LIBGD
if WITH_MYLIBGD
libtcldot_la_LIBADD = \
@@ -71,7 +71,7 @@
tcldot.c $(CODEGENS) $(GDTCLFT) \
$(top_srcdir)/lib/gvc/dot_builtins.c \
$(top_srcdir)/lib/gvc/no_demand_loading.c
-libtcldot_builtin_la_LDFLAGS = -no-undefined
+libtcldot_builtin_la_LDFLAGS = -module -avoid-version -no-undefined
if WITH_LIBGD
if WITH_MYLIBGD
libtcldot_builtin_la_LIBADD = \
--- tclpkg/tclpathplan/Makefile.am
+++ tclpkg/tclpathplan/Makefile.am
@@ -18,7 +18,7 @@
endif
libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c
-libtclplan_la_LDFLAGS = -no-undefined
+libtclplan_la_LDFLAGS = -module -avoid-version -no-undefined
libtclplan_la_LIBADD = \
$(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
$(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
--- tclpkg/tkspline/Makefile.am
+++ tclpkg/tkspline/Makefile.am
@@ -25,7 +25,7 @@
pdf_DATA = $(pdf)
endif
-libtkspline_la_LDFLAGS = -no-undefined
+libtkspline_la_LDFLAGS = -module -avoid-version -no-undefined
libtkspline_la_SOURCES = tkspline.c
libtkspline_la_LIBADD = \
$(top_builddir)/tclpkg/tkstubs/libtkstubs_C.la \

6
graphviz-plugins.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 6 19:02:17 CEST 2007 - pth@suse.de
- Move man pages to _mandir (bugzilla #281398)
- use "-module -avoid-version" for plugins built via libtool.
-------------------------------------------------------------------
Fri May 11 10:32:51 CEST 2007 - ro@suse.de

32
graphviz-plugins.spec
View File

@ -20,23 +20,22 @@ BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-dev
BuildRequires: cairo-devel gcc-java gmp-devel guile-devel libgcj-devel lua-devel mono-core ocaml pango-devel
BuildRequires: graphviz libgnomeui-devel php5-devel
Version: 2.12
Release: 4
Release: 5
Autoreqprov: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.bz2
Patch0: graphviz-fix-pkgIndex.patch
Patch1: graphviz-aliasing-fixes.patch
Patch2: graphviz-config-file-option.patch
Patch3: graphviz-fix_swig_template.patch
Patch4: graphviz-neato_splines.patch
Patch5: graphviz-new_X_paths.patch
Patch7: graphviz-strcmp_fix.patch
# This fix will be in 2.13
Patch8: graphviz-2.11-php_check.patch
Patch9: graphviz-no_libtool_patching.patch
Patch10: graphviz-fix_manpages.patch
Patch11: graphviz-gv_aliasing.patch
Patch12: graphviz-no_plugin_versions.patch
URL: http://www.graphviz.org/
License: IBM Public License
Prefix: /usr
@ -305,17 +304,14 @@ Authors:
%setup -q -n %{mname}-%{version}
%patch
%patch1
#%patch2 -p1
%patch3
%patch4
#%if %{suse_version} > 1010
#%patch5
#%endif
%patch7
%patch8
%patch9
%patch10
%patch11
%patch12
# 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
@ -368,14 +364,11 @@ touch %{buildroot}/usr/lib/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
mv %{buildroot}%{_libdir}/%{mname}/tcl/gv_tcl.man %{buildroot}%{_mandir}/mann/gv_tcl.n
mv %{buildroot}%{_libdir}/%{mname}/perl/gv_perl.man %{buildroot}%{_mandir}/man3/gv_perl.3pm
rm -f %{buildroot}/usr/bin/*
rm -rf %{buildroot}/usr/include/graphviz
rm -f %{buildroot}/usr/lib/graphviz/config
rm -f %{buildroot}/%{_libdir}/graphviz/libgvplugin_core*
rm -f %{buildroot}/%{_libdir}/graphviz/libgvplugin_dot_layout*
rm -f %{buildroot}/%{_libdir}/graphviz/libgvplugin_gd.so
rm -f %{buildroot}/%{_libdir}/graphviz/libgvplugin_gtk*
rm -f %{buildroot}/%{_libdir}/graphviz/libgvplugin_neato_layout*
rm -f %{buildroot}/%{_libdir}/graphviz/libgvplugin_pango*
@ -387,10 +380,15 @@ rm -rf %{buildroot}/usr/share/graphviz/lefty
rm -rf %{buildroot}/%{_mandir}/man1
rm -f %{buildroot}/%{_mandir}/man3/*.3.gz
rm -f %{buildroot}/%{_mandir}/man3/*.3
mv %{buildroot}%{_libdir}/%{mname}/tcl/gv_tcl.man %{buildroot}%{_mandir}/mann/gv_tcl.n
mv %{buildroot}%{_libdir}/%{mname}/perl/gv_perl.man %{buildroot}%{_mandir}/man3/gv_perl.3pm
for lang in ruby python lua ocaml sharp guile; do
mv %{buildroot}%{_libdir}/%{mname}/$lang/gv_$lang.man %{buildroot}%{_mandir}/man3/gv_$lang.3
done
%files -n graphviz-gd
%defattr(-,root,root)
%{_libdir}/graphviz/libgvplugin_gd.so.*
%{_libdir}/graphviz/libgvplugin_gd.so
%post -n graphviz-gd
%{_bindir}/dot -c
@ -398,9 +396,13 @@ rm -f %{buildroot}/%{_mandir}/man3/*.3
%postun -n graphviz-gd
if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_lib}/graphviz/config; fi
%clean
#rm -rf %{buildroot}
%files -n graphviz-guile
%defattr(-,root,root,-)
%{_libdir}/graphviz/guile
%doc %{_mandir}/man3/gv_guile.3.gz
%files -n graphviz-java
%defattr(-,root,root,-)
@ -409,14 +411,17 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%files -n graphviz-sharp
%defattr(-,root,root)
%{_libdir}/graphviz/sharp
%doc %{_mandir}/man3/gv_sharp.3.gz
%files -n graphviz-lua
%defattr(-,root,root,-)
%{_libdir}/graphviz/lua
%doc %{_mandir}/man3/gv_lua.3.gz
%files -n graphviz-ocaml
%defattr(-,root,root,-)
%{_libdir}/graphviz/ocaml
%doc %{_mandir}/man3/gv_ocaml.3.gz
%files -n graphviz-perl
%defattr(-,root,root,-)
@ -430,10 +435,12 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%files -n graphviz-python
%defattr(-,root,root,-)
%{_libdir}/graphviz/python
%doc %{_mandir}/man3/gv_python.3.gz
%files -n graphviz-ruby
%defattr(-,root,root,-)
%{_libdir}/graphviz/ruby
%doc %{_mandir}/man3/gv_ruby.3.gz
%files -n graphviz-tcl
%defattr(-,root,root)
@ -449,6 +456,9 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%doc __doc/*
%changelog
* Wed Jun 06 2007 - pth@suse.de
- Move man pages to _mandir (bugzilla #281398)
- use "-module -avoid-version" for plugins built via libtool.
* Fri May 11 2007 - ro@suse.de
- added get_release_number.sh to sync rel-number between
graphviz and graphviz-plugins

5
graphviz.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 6 19:01:13 CEST 2007 - pth@suse.de
- use "-module -avoid-version" for plugins built via libtool.
-------------------------------------------------------------------
Fri May 11 10:32:20 CEST 2007 - ro@suse.de

12
graphviz.spec
View File

@ -17,23 +17,22 @@ 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
Version: 2.12
Release: 4
Release: 15
Autoreqprov: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.bz2
Patch0: graphviz-fix-pkgIndex.patch
Patch1: graphviz-aliasing-fixes.patch
Patch2: graphviz-config-file-option.patch
Patch3: graphviz-fix_swig_template.patch
Patch4: graphviz-neato_splines.patch
Patch5: graphviz-new_X_paths.patch
Patch7: graphviz-strcmp_fix.patch
# This fix will be in 2.13
Patch8: graphviz-2.11-php_check.patch
Patch9: graphviz-no_libtool_patching.patch
Patch10: graphviz-fix_manpages.patch
Patch11: graphviz-gv_aliasing.patch
Patch12: graphviz-no_plugin_versions.patch
URL: http://www.graphviz.org/
License: IBM Public License
Prefix: /usr
@ -84,17 +83,14 @@ Authors:
%setup -q
%patch
%patch1
#%patch2 -p1
%patch3
%patch4
#%if %{suse_version} > 1010
#%patch5
#%endif
%patch7
%patch8
%patch9
%patch10
%patch11
%patch12
# 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
@ -199,6 +195,8 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%exclude %{_libdir}/graphviz/*.so
%changelog
* Wed Jun 06 2007 - pth@suse.de
- use "-module -avoid-version" for plugins built via libtool.
* Fri May 11 2007 - ro@suse.de
- added get_release_number.sh to sync rel-number between
graphviz and graphviz-plugins