From 3883fdbd8f0b52258d74256d6a0324f2a04af23b Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 26 Jun 2014 17:26:20 +1100 Subject: [PATCH] New version 2.38.0, libgraph5 is no longer build --- .abf.yml | 2 +- graphviz-2.28.0-fix-format-errors.patch | 109 ------------------ graphviz-2.28.0-linkage.patch | 48 -------- graphviz-2.28.0-new-automake-fix.patch | 22 ---- graphviz-2.28.0-ruby1.9.patch | 36 ------ graphviz-2.30.1-linkage.patch | 48 ++++++++ graphviz-2.30.1-pkgconfig.patch | 10 ++ graphviz.spec | 146 ++++++++++-------------- 8 files changed, 119 insertions(+), 302 deletions(-) delete mode 100644 graphviz-2.28.0-fix-format-errors.patch delete mode 100644 graphviz-2.28.0-linkage.patch delete mode 100644 graphviz-2.28.0-new-automake-fix.patch delete mode 100644 graphviz-2.28.0-ruby1.9.patch create mode 100644 graphviz-2.30.1-linkage.patch create mode 100644 graphviz-2.30.1-pkgconfig.patch diff --git a/.abf.yml b/.abf.yml index 7b38149..1a97c02 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "graphviz-2.28.0.tar.gz": 4725d88a13e071ee22e632de551d4a55ca08ee7d + graphviz-2.38.0.tar.gz: 053c771278909160916ca5464a0a98ebf034c6ef diff --git a/graphviz-2.28.0-fix-format-errors.patch b/graphviz-2.28.0-fix-format-errors.patch deleted file mode 100644 index a16cca6..0000000 --- a/graphviz-2.28.0-fix-format-errors.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -ur graphviz-2.26.3.orig/cmd/tools/bcomps.c graphviz-2.26.3/cmd/tools/bcomps.c ---- graphviz-2.26.3.orig/cmd/tools/bcomps.c 2010-01-08 22:28:39.000000000 +0100 -+++ graphviz-2.26.3/cmd/tools/bcomps.c 2010-02-01 22:03:42.000000000 +0100 -@@ -315,7 +315,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - -diff -ur graphviz-2.26.3.orig/cmd/tools/ccomps.c graphviz-2.26.3/cmd/tools/ccomps.c ---- graphviz-2.26.3.orig/cmd/tools/ccomps.c 2010-01-08 22:28:39.000000000 +0100 -+++ graphviz-2.26.3/cmd/tools/ccomps.c 2010-02-01 22:03:42.000000000 +0100 -@@ -99,7 +99,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - -diff -ur graphviz-2.26.3.orig/cmd/tools/dijkstra.c graphviz-2.26.3/cmd/tools/dijkstra.c ---- graphviz-2.26.3.orig/cmd/tools/dijkstra.c 2010-01-08 22:28:39.000000000 +0100 -+++ graphviz-2.26.3/cmd/tools/dijkstra.c 2010-02-01 22:03:42.000000000 +0100 -@@ -237,7 +237,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - -Only in graphviz-2.26.3/cmd/tools: dijkstra.c.orig -diff -ur graphviz-2.26.3.orig/cmd/tools/gc.c graphviz-2.26.3/cmd/tools/gc.c ---- graphviz-2.26.3.orig/cmd/tools/gc.c 2010-01-08 22:28:39.000000000 +0100 -+++ graphviz-2.26.3/cmd/tools/gc.c 2010-02-01 22:03:42.000000000 +0100 -@@ -86,7 +86,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - -diff -ur graphviz-2.26.3.orig/cmd/tools/gvcolor.c graphviz-2.26.3/cmd/tools/gvcolor.c ---- graphviz-2.26.3.orig/cmd/tools/gvcolor.c 2010-01-08 22:28:39.000000000 +0100 -+++ graphviz-2.26.3/cmd/tools/gvcolor.c 2010-02-01 22:03:42.000000000 +0100 -@@ -88,7 +88,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - -diff -ur graphviz-2.26.3.orig/cmd/tools/gvpack.c graphviz-2.26.3/cmd/tools/gvpack.c ---- graphviz-2.26.3.orig/cmd/tools/gvpack.c 2010-01-08 22:28:39.000000000 +0100 -+++ graphviz-2.26.3/cmd/tools/gvpack.c 2010-02-01 22:03:42.000000000 +0100 -@@ -92,7 +92,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - -Only in graphviz-2.26.3/cmd/tools: mm2gv.c.orig -Only in graphviz-2.26.3/cmd/tools: mm2gv.c.rej -diff -ur graphviz-2.26.3.orig/cmd/tools/nop.c graphviz-2.26.3/cmd/tools/nop.c ---- graphviz-2.26.3.orig/cmd/tools/nop.c 2010-01-08 22:28:39.000000000 +0100 -+++ graphviz-2.26.3/cmd/tools/nop.c 2010-02-01 22:03:42.000000000 +0100 -@@ -42,7 +42,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - ---- graphviz-2.28.0/cmd/gvedit/main.cpp.str 2011-05-11 16:42:30.000000000 +0200 -+++ graphviz-2.28.0/cmd/gvedit/main.cpp 2011-05-11 16:42:41.000000000 +0200 -@@ -65,7 +65,7 @@ - - static void usage(int v) - { -- printf(useString); -+ printf("%s",useString); - exit(v); - } - ---- graphviz-2.28.0/lib/ortho/ortho.c.str 2011-05-11 16:37:37.000000000 +0200 -+++ graphviz-2.28.0/lib/ortho/ortho.c 2011-05-11 16:37:53.000000000 +0200 -@@ -1520,7 +1520,7 @@ - absbb.LL.x = absbb.LL.y = MAXDOUBLE; - absbb.UR.x = absbb.UR.y = -MAXDOUBLE; - -- fprintf (fp, prolog2); -+ fprintf (fp, "%s", prolog2); - fprintf (fp, "%d %d translate\n", TRANS, TRANS); - - fputs ("0 0 1 setrgbcolor\n", fp); diff --git a/graphviz-2.28.0-linkage.patch b/graphviz-2.28.0-linkage.patch deleted file mode 100644 index 44bf4be..0000000 --- a/graphviz-2.28.0-linkage.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- plugin/gtk/Makefile.am.link 2011-09-22 13:53:15.396340012 +0800 -+++ plugin/gtk/Makefile.am 2011-09-22 13:53:36.088210688 +0800 -@@ -37,7 +37,7 @@ - - libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ - libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES) --libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11 - - if WITH_WIN32 - libgvplugin_gtk_la_LDFLAGS += -no-undefined ---- plugin/gtk/Makefile.in.link 2011-09-22 13:53:22.628204613 +0800 -+++ plugin/gtk/Makefile.in 2011-09-22 13:54:21.718204654 +0800 -@@ -510,7 +510,7 @@ - libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ \ - $(am__append_1) $(am__append_2) - libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES) --libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -+libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11 - EXTRA_DIST = gtk.glade gtk.gladep - all: all-am - ---- cmd/dot/Makefile.am.link 2011-12-05 01:55:09.196840925 +0800 -+++ cmd/dot/Makefile.am 2011-12-05 01:55:38.046841679 +0800 -@@ -116,8 +116,8 @@ - endif - - if WITH_PANGOCAIRO --dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) --dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) -+dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) -+dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) - endif - - EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj ---- cmd/dot/Makefile.in.link 2011-05-07 11:27:39.000000000 +0800 -+++ cmd/dot/Makefile.in 2011-12-05 02:07:36.536493154 +0800 -@@ -53,8 +53,8 @@ - @WITH_LIBGD_TRUE@@WITH_MYLIBGD_TRUE@am__append_5 = $(top_builddir)/plugin/gd/libgvplugin_gd.la $(top_builddir)/lib/gd/libgvgd_C.la $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) - @WITH_LIBGD_TRUE@@WITH_MYLIBGD_FALSE@am__append_6 = $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) - @WITH_LIBGD_TRUE@@WITH_MYLIBGD_FALSE@am__append_7 = $(top_builddir)/plugin/gd/libgvplugin_gd.la $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) --@WITH_PANGOCAIRO_TRUE@am__append_8 = $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) --@WITH_PANGOCAIRO_TRUE@am__append_9 = $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) -+@WITH_PANGOCAIRO_TRUE@am__append_8 = $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) -+@WITH_PANGOCAIRO_TRUE@am__append_9 = $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) - subdir = cmd/dot - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/graphviz-2.28.0-new-automake-fix.patch b/graphviz-2.28.0-new-automake-fix.patch deleted file mode 100644 index 85a42f8..0000000 --- a/graphviz-2.28.0-new-automake-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- graphviz-2.28.0/plugin/ming/Makefile.am~ 2009-06-03 03:10:57.000000000 +0200 -+++ graphviz-2.28.0/plugin/ming/Makefile.am 2012-02-16 06:46:22.942762556 +0100 -@@ -17,7 +17,7 @@ lib_LTLIBRARIES = libgvplugin_ming.la - else - pkglib_LTLIBRARIES = libgvplugin_ming.la - endif --pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb -+pkgdata_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb - endif - - libgvplugin_ming_C_la_SOURCES = \ ---- graphviz-2.28.0/tclpkg/gv/Makefile.am~ 2011-03-28 20:15:56.000000000 +0200 -+++ graphviz-2.28.0/tclpkg/gv/Makefile.am 2012-02-16 06:46:03.902743183 +0100 -@@ -257,7 +257,7 @@ $(TCL_data): gv_tcl.cpp - gv_tcl.cpp: gv.i - $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i - --pkginclude_DATA = gv.i gv.cpp -+pkgdata_DATA = gv.i gv.cpp - pkglib_LTLIBRARIES = - man_MANS = - pdf_DATA = diff --git a/graphviz-2.28.0-ruby1.9.patch b/graphviz-2.28.0-ruby1.9.patch deleted file mode 100644 index 889028c..0000000 --- a/graphviz-2.28.0-ruby1.9.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- graphviz-2.28.0/config/config_ruby.rb.ruby19~ 2011-02-18 22:25:56.000000000 +0100 -+++ graphviz-2.28.0/config/config_ruby.rb 2012-02-16 02:59:05.410021805 +0100 -@@ -5,12 +5,12 @@ CONFIG = Config::MAKEFILE_CONFIG - - case ARGV[0] - when "INCLUDES" -- puts Config::expand(CONFIG["archdir"]) -+ puts Config::expand(RbConfig::CONFIG["archdir"]) - when "lib" -- puts Config::expand(CONFIG["libdir"]) -+ puts Config::expand(RbConfig::CONFIG["libdir"]) - when "archsitelib" -- puts Config::expand(CONFIG["sitearchdir"]) -+ puts Config::expand(RbConfig::CONFIG["vendorarchdir"]) - when "sitelib" -- puts Config::expand(CONFIG["sitedir"]) -+ puts Config::expand(RbConfig::CONFIG["sitedir"]) - end - ---- graphviz-2.28.0/configure.ac.ruby19~ 2012-02-16 03:00:56.579170774 +0100 -+++ graphviz-2.28.0/configure.ac 2012-02-16 03:00:59.489174708 +0100 -@@ -1510,12 +1510,12 @@ else - if test "x$RUBY" = "x"; then - use_ruby="No (ruby not available)" - else -- RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`" -+ RUBY_INCLUDES="$(pkg-config --cflags ruby-1.9)" - # hack for powerpc-darwin8 (10.4) - if test "x$DARWIN" = "xyes"; then - RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'` - fi -- RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`" -+ RUBY_LIBS="$(pkg-config --libs ruby-1.9)" - RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`" - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES" diff --git a/graphviz-2.30.1-linkage.patch b/graphviz-2.30.1-linkage.patch new file mode 100644 index 0000000..7748002 --- /dev/null +++ b/graphviz-2.30.1-linkage.patch @@ -0,0 +1,48 @@ +--- cmd/dot/Makefile.in.orig 2013-02-23 11:26:50.729883499 +0000 ++++ cmd/dot/Makefile.in 2013-02-23 11:28:44.263888094 +0000 +@@ -70,8 +70,8 @@ + @WITH_LIBGD_TRUE@am__append_5 = $(top_builddir)/plugin/gd/libgvplugin_gd.la $(GD_LIBS) + @WITH_PANGOCAIRO_TRUE@@WITH_WEBP_TRUE@am__append_6 = $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS) + @WITH_PANGOCAIRO_TRUE@@WITH_WEBP_TRUE@am__append_7 = $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS) +-@WITH_PANGOCAIRO_TRUE@am__append_8 = $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) +-@WITH_PANGOCAIRO_TRUE@am__append_9 = $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) ++@WITH_PANGOCAIRO_TRUE@am__append_8 = $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) ++@WITH_PANGOCAIRO_TRUE@am__append_9 = $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) + @WITH_PANGOCAIRO_TRUE@@WITH_WEBP_TRUE@am__append_10 = $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS) + @WITH_PANGOCAIRO_TRUE@@WITH_WEBP_TRUE@am__append_11 = $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS) + @WITH_LASI_TRUE@am__append_12 = $(top_builddir)/plugin/lasi/.libs/libgvplugin_lasi_C.a \ +--- cmd/dot/Makefile.am.orig 2013-02-23 11:26:45.574883291 +0000 ++++ cmd/dot/Makefile.am 2013-02-23 11:27:51.231885948 +0000 +@@ -117,8 +117,8 @@ + dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS) + dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS) + endif +-dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) +-dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) ++dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) ++dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) + if WITH_WEBP + dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a $(WEBP_LIBS) + dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la $(WEBP_LIBS) +--- plugin/gtk/Makefile.am.orig 2013-02-23 11:25:20.238879837 +0000 ++++ plugin/gtk/Makefile.am 2013-02-23 11:25:40.256880647 +0000 +@@ -37,7 +37,7 @@ + + libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ + libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES) +-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) ++libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11 + + if WITH_WIN32 + libgvplugin_gtk_la_LDFLAGS += -no-undefined +--- plugin/gtk/Makefile.in.orig 2013-02-23 11:25:47.896880957 +0000 ++++ plugin/gtk/Makefile.in 2013-02-23 11:26:20.128882261 +0000 +@@ -535,7 +535,7 @@ + libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ \ + $(am__append_1) $(am__append_2) + libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES) +-libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) ++libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11 + EXTRA_DIST = gtk.glade gtk.gladep + all: all-am + diff --git a/graphviz-2.30.1-pkgconfig.patch b/graphviz-2.30.1-pkgconfig.patch new file mode 100644 index 0000000..73812b6 --- /dev/null +++ b/graphviz-2.30.1-pkgconfig.patch @@ -0,0 +1,10 @@ +--- lib/gvc/libgvc.pc.in.orig 2013-02-23 20:09:24.352375169 +0000 ++++ lib/gvc/libgvc.pc.in 2013-02-23 20:09:33.643375545 +0000 +@@ -7,6 +7,6 @@ + Name: libgvc + Description: The GraphVizContext library + Version: @VERSION@ +-Libs: -L${libdir} -lgvc -lgraph -lcdt ++Libs: -L${libdir} -lgvc -lcgraph -lcdt + Cflags: -I${includedir} + diff --git a/graphviz.spec b/graphviz.spec index 13463d5..8b1286a 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -7,7 +7,6 @@ %define cdt_major 5 %define cgraph_major 6 -%define graph_major 5 %define gvc_major 6 %define gvpr_major 2 %define pathplan_major 4 @@ -15,12 +14,11 @@ %define lib_cdt %mklibname cdt %{cdt_major} %define lib_cgraph %mklibname cgraph %{cgraph_major} -%define lib_graph %mklibname graph %{graph_major} %define lib_gvc %mklibname gvc %{gvc_major} %define lib_gvpr %mklibname gvpr %{gvpr_major} %define lib_pathplan %mklibname pathplan %{pathplan_major} %define lib_xdot %mklibname xdot %{xdot_major} -%define develname %mklibname graphviz -d +%define devname %mklibname graphviz -d %define staticname %mklibname graphviz -d -s %if %{_use_internal_dependency_generator} @@ -29,26 +27,24 @@ Summary: Graph visualization tools Name: graphviz -Version: 2.28.0 -Release: 6 -Group: Graphics +Version: 2.38.0 +Release: 1 License: Common Public License -URL: http://www.graphviz.org +Group: Graphics +Url: http://www.graphviz.org Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz -Patch0: graphviz-2.28.0-linkage.patch -Patch4: graphviz-2.28.0-fix-format-errors.patch -Patch5: graphviz-2.28.0-ruby1.9.patch -Patch6: graphviz-2.28.0-new-automake-fix.patch -BuildRequires: bison >= 2.3 -BuildRequires: flex >= 2.5.4a +Patch0: graphviz-2.30.1-linkage.patch +Patch1: graphviz-2.30.1-pkgconfig.patch +BuildRequires: bison +BuildRequires: flex BuildRequires: libtool -BuildRequires: swig >= 1.3.29 -BuildRequires: expat-devel -BuildRequires: gd-devel >= 2.0.34 -BuildRequires: gettext-devel >= 0.14.5 +BuildRequires: swig +BuildRequires: gd-devel +BuildRequires: gettext-devel # jpeg: No (only required by internal libgd) #BuildRequires: jpeg-devel BuildRequires: libltdl-devel +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glut) @@ -75,15 +71,21 @@ of graphs (as in nodes and edges, not as in barcharts). %files %dir %{_libdir}/%{name} %{_bindir}/* -%_mandir/man?/* +%{_mandir}/man?/* %{_datadir}/graphviz %{_libdir}/graphviz/*.so.* +%post +%{_bindir}/dot -c + +%postun +if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi + #------------------------------------------------------------------------- %package doc -Group: Books/Computer books Summary: %{name} documentation +Group: Books/Computer books %description doc The %{name} documentation. @@ -94,8 +96,8 @@ The %{name} documentation. #------------------------------------------------------------------------- %package -n %{lib_cdt} -Group: System/Libraries Summary: Shared library for %{name} +Group: System/Libraries Conflicts: %{_lib}graphviz4 < 2.26 %description -n %{lib_cdt} @@ -107,8 +109,8 @@ This package provides the cdt shared library for %{name}. #------------------------------------------------------------------------- %package -n %{lib_cgraph} -Group: System/Libraries Summary: Shared library for %{name} +Group: System/Libraries Conflicts: %{_lib}graphviz4 < 2.26 %description -n %{lib_cgraph} @@ -119,24 +121,9 @@ This package provides the cgraph shared library for %{name}. #------------------------------------------------------------------------- -%package -n %{lib_graph} -Group: System/Libraries -Summary: Shared library for %{name} -Conflicts: %{_lib}graphviz4 < 2.26 -Obsoletes: %{_lib}graphviz4 < 2.26 - -%description -n %{lib_graph} -This package provides the graph shared library for %{name}. - -%files -n %{lib_graph} -%defattr(-,root,root) -%{_libdir}/libgraph.so.%{graph_major}* - -#------------------------------------------------------------------------- - %package -n %{lib_gvc} -Group: System/Libraries Summary: Shared library for %{name} +Group: System/Libraries Conflicts: %{_lib}graphviz4 < 2.26 %description -n %{lib_gvc} @@ -148,8 +135,8 @@ This package provides the gvc shared library for %{name}. #------------------------------------------------------------------------- %package -n %{lib_gvpr} -Group: System/Libraries Summary: Shared library for %{name} +Group: System/Libraries %description -n %{lib_gvpr} This package provides the gvpr shared library for %{name}. @@ -160,8 +147,8 @@ This package provides the gvpr shared library for %{name}. #------------------------------------------------------------------------- %package -n %{lib_pathplan} -Group: System/Libraries Summary: Shared library for %{name} +Group: System/Libraries Conflicts: %{_lib}graphviz4 < 2.26 %description -n %{lib_pathplan} @@ -173,8 +160,8 @@ This package provides the pathplan shared library for %{name}. #------------------------------------------------------------------------- %package -n %{lib_xdot} -Group: System/Libraries Summary: Shared library for %{name} +Group: System/Libraries %description -n %{lib_xdot} This package provides the xdot shared library for %{name}. @@ -187,10 +174,9 @@ This package provides the xdot shared library for %{name}. %define lua_version %(if [ -x /usr/bin/lua ]; then lua -v 2>&1| awk '{print $2}' | awk -F. '{print $1 "." $2}'; fi) %package -n lua-graphviz -Group: System/Libraries Summary: Graphviz bindings for lua -BuildRequires: lua-devel -Obsoletes: %{mklibname graphvizlua 0} +Group: System/Libraries +BuildRequires: pkgconfig(lua) %description -n lua-graphviz This package provides the Lua extension for %{name}. @@ -201,9 +187,9 @@ This package provides the Lua extension for %{name}. #------------------------------------------------------------------------- -%package -n php-graphviz -Group: System/Libraries +%package -n php-graphviz Summary: Graphviz bindings for php +Group: System/Libraries BuildRequires: php-devel BuildRequires: php-cli Obsoletes: %{mklibname graphvizphp 0} < 2.28.0-4 @@ -219,23 +205,23 @@ This package provides the PHP extension for %{name}. #------------------------------------------------------------------------- %package -n python-graphviz -Group: System/Libraries Summary: Graphviz bindings for python +Group: System/Libraries Obsoletes: %{mklibname graphvizpython 0} < 2.28.0-4 -BuildRequires: python-devel +BuildRequires: pkgconfig(python) %description -n python-graphviz This package provides the Python extension for %{name}. %files -n python-graphviz %{_libdir}/graphviz/python -%py_platsitedir/* +%{py_platsitedir}/* #------------------------------------------------------------------------- %package -n ruby-graphviz -Group: System/Libraries Summary: Graphviz bindings for ruby +Group: System/Libraries BuildRequires: ruby-devel Obsoletes: %{mklibname graphvizruby 0} < 2.28.0-4 @@ -249,8 +235,8 @@ This package provides the Ruby extension for %{name}. #------------------------------------------------------------------------- %package -n perl-graphviz -Group: System/Libraries Summary: Graphviz bindings for perl +Group: System/Libraries BuildRequires: perl-devel Obsoletes: %{mklibname graphvizperl 0} < 2.28.0-4 @@ -264,8 +250,8 @@ This package provides the Perl extension for %{name}. #------------------------------------------------------------------------- %package -n tcl-graphviz -Group: System/Libraries Summary: Graphviz bindings for tcl +Group: System/Libraries BuildRequires: tcl-devel >= 8.3.0 BuildRequires: tk-devel >= 8.3.0 BuildRequires: tk >= 8.3.0 @@ -285,8 +271,8 @@ This package provides the Tcl extension for %{name}. %define java_includes %{_includedir}/libgcj %package -n java-graphviz -Group: System/Libraries Summary: Graphviz bindings for java +Group: System/Libraries BuildRequires: java-devel Obsoletes: %{mklibname graphvizjava 0} < 2.28.0-4 @@ -297,12 +283,12 @@ This package provides the Java extension for %{name}. %{_libdir}/graphviz/java #------------------------------------------------------------------------- -%if %with libr +%if %{with libr} %package -n r-graphviz -Group: System/Libraries Summary: Graphviz bindings for R -BuildRequires: libRmath-devel +Group: System/Libraries +BuildRequires: pkgconfig(libRmath) Obsoletes: %{mklibname graphvizr 0} < 2.28.0-4 %description -n r-graphviz @@ -310,13 +296,13 @@ This package provides the R extension for %{name}. %files -n r-graphviz %{_libdir}/graphviz/R - %endif + #------------------------------------------------------------------------- %package -n ocaml-graphviz -Group: System/Libraries Summary: Graphviz bindings for OCaml +Group: Development/OCaml BuildRequires: ocaml Obsoletes: %{mklibname graphvizocaml 0} < 2.28.0-4 @@ -328,25 +314,24 @@ This package provides the OCaml extension for %{name}. #------------------------------------------------------------------------- -%package -n %{develname} +%package -n %{devname} Group: Development/Other Summary: Development package for %{name} -Provides: %{name}-devel = %{version}-%{release} +Provides: %{name}-devel = %{EVRD} Obsoletes: %{mklibname graphviz -d 7} < 2.28.0-4 Obsoletes: %{mklibname tcl -d 7} < 2.28.0-4 Obsoletes: %{mklibname -d graphviz 3} < 2.28.0-4 -Requires: %{lib_cdt} = %{version} -Requires: %{lib_cgraph} = %{version} -Requires: %{lib_graph} = %{version} -Requires: %{lib_gvc} = %{version} -Requires: %{lib_gvpr} = %{version} -Requires: %{lib_pathplan} = %{version} -Requires: %{lib_xdot} = %{version} +Requires: %{lib_cdt} = %{EVRD} +Requires: %{lib_cgraph} = %{EVRD} +Requires: %{lib_gvc} = %{EVRD} +Requires: %{lib_gvpr} = %{EVRD} +Requires: %{lib_pathplan} = %{EVRD} +Requires: %{lib_xdot} = %{EVRD} -%description -n %{develname} +%description -n %{devname} Development package for %{name}. -%files -n %{develname} +%files -n %{devname} %{_libdir}/pkgconfig/* %{_libdir}/graphviz/*.so %{_libdir}/*.so @@ -354,12 +339,12 @@ Development package for %{name}. #------------------------------------------------------------------------- -%if ! %without static +%if ! %{without static} %package -n %{staticname} Group: Development/Other Summary: Static development package for %{name} -Requires: %{develname} = %{version}-%{release} -Provides: %{name}-static-devel = %{version}-%{release} +Requires: %{devname} = %{EVRD} +Provides: %{name}-static-devel = %{EVRD} Obsoletes: %{mklibname -d -s graphviz 3} < 2.28.0-4 %description -n %{staticname} @@ -368,7 +353,6 @@ Static development package for %{name}. %files -n %{staticname} %{_libdir}/graphviz/*.a %{_libdir}/*.a - %endif #------------------------------------------------------------------------- @@ -376,20 +360,17 @@ Static development package for %{name}. %prep %setup -q %patch0 -p0 -b .link -%patch4 -p1 -b .format -%patch5 -p1 -b .ruby19~ -%patch6 -p1 -b .automake~ -autoreconf -f %build +autoreconf -fi %configure2_5x \ --with-x \ -%if %without static - --disable-static \ +%if %{without static} + --disable-static \ %else --enable-static \ %endif -%if %with libr +%if %{with libr} --enable-r \ %else --disable-r \ @@ -409,7 +390,6 @@ autoreconf -f %make TK_LIB_SPEC="-ltcl -ltk" LIBS="-lX11" %install -rm -rf %{buildroot} %makeinstall_std # fix documentation @@ -417,9 +397,3 @@ install -d -m 755 %{buildroot}%{_docdir} mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/%{name}/demo %{buildroot}%{_docdir}/%{name} -%post -%{_bindir}/dot -c - -%postun -if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi -