From e85ca7993584ffa3479e80844bc3c48828a5a581 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Thu, 12 Jul 2007 19:43:18 +0000 Subject: [PATCH 01/31] - Patch to fix BZ#241790 (thanks John!) --- graphviz-black.patch | 29 +++++++++++++++++++++++++++++ graphviz.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 graphviz-black.patch diff --git a/graphviz-black.patch b/graphviz-black.patch new file mode 100644 index 0000000..18cfa48 --- /dev/null +++ b/graphviz-black.patch @@ -0,0 +1,29 @@ +--- graphviz-2.12/lib/common/colxlate.c.orig 2006-07-26 22:44:05.000000000 -0500 ++++ graphviz-2.12/lib/common/colxlate.c 2007-07-12 14:07:13.000000000 -0500 +@@ -1,4 +1,4 @@ +-/* $Id: colxlate.c,v 1.11 2006/07/27 03:44:05 erg Exp $ $Revision: 1.11 $ */ ++/* $Id: colxlate.c,v 1.13 2007/07/12 16:47:57 erg Exp $ $Revision: 1.13 $ */ + /* vim:set shiftwidth=4 ts=8: */ + + /********************************************************** +@@ -180,6 +180,10 @@ + + /* resolveColor: + * Resolve input color str allowing color scheme namespaces. ++ * 0) "black" => "black" ++ * NB: This is something of a hack due to the remaining codegen. ++ * Once these are gone, this case could be removed and all references ++ * to "black" could be replaced by "/X11/black". + * 1) No initial / => + * if colorscheme is defined and no "X11", return /colorscheme/str + * else return str +@@ -214,7 +218,8 @@ + char* ss; /* second slash */ + char* c2; /* second char */ + +- if (*str == '/') { /* if begins with '/' */ ++ if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str; ++ else if (*str == '/') { /* if begins with '/' */ + c2 = str+1; + if ((ss = strchr(c2, '/'))) { /* if has second '/' */ + if (*c2 == '/') { /* if second '/' is second character */ diff --git a/graphviz.spec b/graphviz.spec index 5bb1969..e4e4a05 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -7,13 +7,14 @@ #-- graphviz src.rpm -------------------------------------------------------- Name: graphviz Version: 2.12 -Release: 7%{?dist} +Release: 8%{?dist} License: CPL URL: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz Patch0: %{name}-php5.patch Patch1: %{name}-libcdt.patch +Patch2: %{name}-black.patch # graphviz is relocatable #Prefix: /usr @@ -403,6 +404,7 @@ Provides some additional PDF and HTML documentation for graphviz. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # XXX ix86 only used to have -ffast-math, let's use everywhere @@ -439,6 +441,9 @@ rm -rf $RPM_BUILD_ROOT #-- changelog -------------------------------------------------- %changelog +* Thu Jul 12 2007 Patrick "Jima" Laughton 2.12-8 +- Patch to fix BZ#241790 (thanks John!) + * Sat May 05 2007 Patrick "Jima" Laughton 2.12-7 - Patch to fix BZ#237496 - Disabling relocatability to work around BZ#237082 From b9c2af2e87919559349b93a5fd626cbcef5cf81d Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Thu, 23 Aug 2007 16:37:55 +0000 Subject: [PATCH 02/31] - Added perl-devel to BR for F7+ New upstream release (2.14.1), and returning to using upstream's graphviz.spec (he gives it more love than I could ever hope to). --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index f120aae..c2595cd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -graphviz-2.12.tar.gz +graphviz-2.14.1.tar.gz diff --git a/sources b/sources index 6453784..f497e47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e5547bc0ec47943c72f5c3e2b5dff58f graphviz-2.12.tar.gz +0c56ba28d4e24f3ddd5e8fdb58deba70 graphviz-2.14.1.tar.gz From d38622c9abf5d6eed21266202db101e2f1779f17 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Thu, 23 Aug 2007 16:40:18 +0000 Subject: [PATCH 03/31] - Added perl-devel to BR for F7+ New upstream release (2.14.1), and returning to using upstream's graphviz.spec (he gives it more love than I could ever hope to). This time let's actually commit the new graphviz.spec. :-) --- graphviz.spec | 416 ++++++++++++++++++++++++++++---------------------- 1 file changed, 231 insertions(+), 185 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index e4e4a05..6a73106 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,89 +1,99 @@ -# $Id: graphviz.spec.in,v 1.96 2006/10/24 13:46:11 ellson Exp $ $Revision: 1.96 $ +# $Id: graphviz.spec.in,v 1.117 2007/08/16 01:53:22 ellson Exp $ $Revision: 1.117 $ # graphviz.spec. Generated from graphviz.spec.in by configure. -# Note: graphviz requires gd with gif support (and other fixes), hence use -# internal one for now. +# Note: pre gd-2.0.34 graphviz uses its own gd tree with gif support and other fixes -#-- graphviz src.rpm -------------------------------------------------------- -Name: graphviz -Version: 2.12 -Release: 8%{?dist} +#-- Global graphviz rpm and src.rpm tags------------------------------------- +Name: graphviz +Summary: Graph Visualization Tools +Version: 2.14.1 -License: CPL -URL: http://www.graphviz.org/ -Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz -Patch0: %{name}-php5.patch -Patch1: %{name}-libcdt.patch -Patch2: %{name}-black.patch +%define truerelease 2 +%{?distroagnostic: %define release %{truerelease}} +%{!?distroagnostic: %define release %{truerelease}%{?dist}} -# graphviz is relocatable -#Prefix: /usr -# not until we can figure out why relocatabilty is broken +Release: %{?release} + +Group: Applications/Multimedia +License: CPL +URL: http://www.graphviz.org/ +Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.14.1.tar.gz #-- feature and package selection ------------------------------------------- -# depends on %dist and %fedora (or %rhl or %rhel) which are set -# in .rpmmacros on each build host +# depends on %dist and %fedora (or %rhl or %rhel) which are set +# in .rpmmacros on each build host # Define a default set of features incase none of the conditionals apply -%define SHARP 0 -%define GUILE 0 -%define _IO 0 -%define JAVA 0 -%define LUA 0 -%define OCAML 0 -%define PERL 0 -%define PHP 0 -%define PYTHON 0 -%define RUBY 0 -%define TCL 1 -%define IPSEPCOLA --without-ipsepcola -%define MYLIBGD --with-mylibgd -%define MING --without-ming +%define SHARP 0 +%define GUILE 0 +%define _IO 0 +%define JAVA 0 +%define LUA 0 +%define OCAML 0 +%define PERL 0 +%define PHP 0 +%define PYTHON 0 +%define RUBY 0 +%define TCL 1 +%define IPSEPCOLA --without-ipsepcola +%define MYLIBGD --with-mylibgd +%define MING --without-ming +%define PANGOCAIRO --without-pangocairo # SuSE uses a different mechanism to generate BuildRequires # norootforbuild # neededforbuild expat freetype2 freetype2-devel gcc libjpeg libpng-devel-packages tcl tcl-devel tk tk-devel x-devel-packages -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 -BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig +BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 +BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig # This just indicates the requirement for tcl.h, tk.h, but doesn't identify # where to get them from. In RH9 and earlier they were in the tcl, tk, # base packages which are always BR'd anyway (above). -BuildRequires: /usr/include/tcl.h /usr/include/tk.h +BuildRequires: /usr/include/tcl.h /usr/include/tk.h +#-- Red Hat Linux specific Build Requirements ------------------------------- %if 0%{?rhl} -%define PERL 1 -%define TCL 1 -BuildRequires: XFree86-devel perl +%define TCL 1 +BuildRequires: XFree86-devel %endif +#-- Red Hat Enterprise Linux specific Build Requirements -------------------- %if 0%{?rhel} -%define PERL 1 -%define TCL 1 -BuildRequires: perl +%define TCL 1 %if "%rhel" < "4" -BuildRequires: XFree86-devel +BuildRequires: XFree86-devel %endif %if "%rhel" >= "3" %define IPSEPCOLA --with-ipsepcola BuildRequires: fontconfig-devel tcl-devel tk-devel %endif +%if "%rhel" == "4" +BuildRequires: xorg-x11-devel +%endif %if "%rhel" >= "4" -%define PHP 1 -%define RUBY 1 -BuildRequires: xorg-x11-devel php-devel ruby ruby-devel +# PERL is available earlier, but a suitable SWIG isn't +%define PERL 1 +%define PHP 1 +%define RUBY 1 +%define GUILE 1 +%define PYTHON 1 +BuildRequires: perl php-devel ruby ruby-devel guile-devel python-devel %endif %if "%rhel" >= "5" -BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel +%define JAVA 1 +%define PANGOCAIRO --with-pangocairo +BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel +BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif %endif +#-- Fedora specific Build Requirements -------------------------------------- %if 0%{?fedora} -%define PERL 1 -%define TCL 1 +%define PERL 1 +%define TCL 1 BuildRequires: fontconfig-devel tcl-devel tk-devel %if "%fedora" < "3" BuildRequires: XFree86-devel @@ -98,38 +108,53 @@ BuildRequires: xorg-x11-devel %define IPSEPCOLA --with-ipsepcola %endif %if "%fedora" >= "4" -%define PHP 1 -%define RUBY 1 -%define GUILE 1 -BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel +%define PHP 1 +%define RUBY 1 +%define GUILE 1 +%define PYTHON 1 +BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel python-devel %endif %if "%fedora" >= "5" -%define JAVA 1 -%define PYTHON 1 -BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel libgcj-devel python-devel java-devel +%define JAVA 1 +BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel %ifnarch ppc64 -%define SHARP 1 -%define OCAML 1 +%define SHARP 1 +%define OCAML 1 BuildRequires: mono-core ocaml %endif %endif %if "%fedora" >= "6" -%define LUA 1 -BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel +%define LUA 1 +%define PANGOCAIRO --with-pangocairo +BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel +%endif +%if "%fedora" >= "7" +BuildRequires: gd gd-devel perl-devel +%define MYLIBGD --without-mylibgd %endif %endif -#-- graphviz rpm -------------------------------------------------- -Group: Applications/Multimedia -Summary: Graph Visualization Tools -Requires: urw-fonts -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig +#-- main graphviz rpm ------------------------------------------------ +Requires: urw-fonts +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig %description A collection of tools for the manipulation and layout of graphs (as in nodes and edges, not as in barcharts). +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post +/sbin/ldconfig +%{_bindir}/dot -c + +# if there is no dot after everything else is done, then remove config +%postun +if [ $1 -eq 0 ]; then + rm -f %{_libdir}/graphviz/config || : +fi +/sbin/ldconfig + %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README @@ -138,47 +163,44 @@ of graphs (as in nodes and edges, not as in barcharts). %{_libdir}/*.so.* %{_libdir}/graphviz/*.so.* %{_mandir}/man1/*.1* +%{_mandir}/man7/*.7* %dir %{_datadir}/graphviz %{_datadir}/graphviz/lefty %exclude %{_libdir}/graphviz/*/* %exclude %{_libdir}/graphviz/libgvplugin_gd.* -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post -%{_bindir}/dot -c -/sbin/ldconfig - -# if there is no dot after everything else is done, the remove config -%postun -if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/graphviz/config; fi -/sbin/ldconfig - #-- graphviz-gd rpm -------------------------------------------------- %package gd -Group: Applications/Multimedia -Summary: Graphviz plugin for renderers based on gd -Requires: graphviz = %{version}-%{release} +Group: Applications/Multimedia +Summary: Graphviz plugin for renderers based on gd +Requires: graphviz = %{version}-%{release} +Requires(post): %{_bindir}/dot /sbin/ldconfig +Requires(postun): %{_bindir}/dot /sbin/ldconfig %description gd -graphviz plugin for renderers based on gd +Graphviz plugin for renderers based on gd. (Unless you absolutely have +to use GIF, you are recommended to use the PNG format instead because +of the better quality anti-aliased lines provided by the cairo+pango +based renderer.) + +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post gd +/sbin/ldconfig +%{_bindir}/dot -c + +%postun gd +/sbin/ldconfig +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : %files gd %{_libdir}/graphviz/libgvplugin_gd.so.* -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post gd -%{_bindir}/dot -c - -# if there is not dot after everything else is done, the remove config -%postun gd -if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/graphviz/config; fi - #-- graphviz-sharp rpm -------------------------------------------- %if %{SHARP} %package sharp -Group: Applications/Multimedia -Summary: C# extension for graphviz -Requires: graphviz = %{version}-%{release} mono-core +Group: Applications/Multimedia +Summary: C# extension for graphviz +Requires: graphviz = %{version}-%{release} mono-core %description sharp C# extension for graphviz. @@ -187,14 +209,15 @@ C# extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/sharp %{_libdir}/graphviz/sharp/* +%{_mandir}/mann/gv_sharp.n* %endif #-- graphviz-guile rpm -------------------------------------------- %if %{GUILE} %package guile -Group: Applications/Multimedia -Summary: Guile extension for graphviz -Requires: graphviz = %{version}-%{release} guile +Group: Applications/Multimedia +Summary: Guile extension for graphviz +Requires: graphviz = %{version}-%{release} guile %description guile Guile extension for graphviz. @@ -203,14 +226,15 @@ Guile extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/guile %{_libdir}/graphviz/guile/* +%{_mandir}/mann/gv_guile.n* %endif #-- graphviz-io rpm ----------------------------------------------- %if %{_IO} %package io -Group: Applications/Multimedia -Summary: Io extension for graphviz -Requires: graphviz = %{version}-%{release} io +Group: Applications/Multimedia +Summary: Io extension for graphviz +Requires: graphviz = %{version}-%{release} io %description io Io extension for graphviz. @@ -219,14 +243,15 @@ Io extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/io %{_libdir}/graphviz/io/* +%{_mandir}/mann/gv_io.n* %endif #-- graphviz-java rpm --------------------------------------------- %if %{JAVA} %package java -Group: Applications/Multimedia -Summary: Java extension for graphviz -Requires: graphviz = %{version}-%{release} java +Group: Applications/Multimedia +Summary: Java extension for graphviz +Requires: graphviz = %{version}-%{release} java %description java Java extension for graphviz. @@ -235,14 +260,15 @@ Java extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/java %{_libdir}/graphviz/java/* +%{_mandir}/mann/gv_java.n* %endif #-- graphviz-lua rpm ---------------------------------------------- %if %{LUA} %package lua -Group: Applications/Multimedia -Summary: Lua extension for graphviz -Requires: graphviz = %{version}-%{release} lua +Group: Applications/Multimedia +Summary: Lua extension for graphviz +Requires: graphviz = %{version}-%{release} lua %description lua Lua extension for graphviz. @@ -251,14 +277,15 @@ Lua extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/lua %{_libdir}/graphviz/lua/* +%{_mandir}/mann/gv_lua.n* %endif #-- graphviz-ocaml rpm -------------------------------------------- %if %{OCAML} %package ocaml -Group: Applications/Multimedia -Summary: Ocaml extension for graphviz -Requires: graphviz = %{version}-%{release} ocaml +Group: Applications/Multimedia +Summary: Ocaml extension for graphviz +Requires: graphviz = %{version}-%{release} ocaml %description ocaml Ocaml extension for graphviz. @@ -267,14 +294,15 @@ Ocaml extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/ocaml %{_libdir}/graphviz/ocaml/* +%{_mandir}/mann/gv_ocaml.n* %endif #-- graphviz-perl rpm --------------------------------------------- %if %{PERL} %package perl -Group: Applications/Multimedia -Summary: Perl extension for graphviz -Requires: graphviz = %{version}-%{release} perl +Group: Applications/Multimedia +Summary: Perl extension for graphviz +Requires: graphviz = %{version}-%{release} perl %description perl Perl extension for graphviz. @@ -283,14 +311,15 @@ Perl extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/perl %{_libdir}/graphviz/perl/* +%{_mandir}/mann/gv_perl.n* %endif #-- graphviz-php rpm ---------------------------------------------- %if %{PHP} %package php -Group: Applications/Multimedia -Summary: PHP extension for graphviz -Requires: graphviz = %{version}-%{release} php +Group: Applications/Multimedia +Summary: PHP extension for graphviz +Requires: graphviz = %{version}-%{release} php %description php PHP extension for graphviz. @@ -299,14 +328,15 @@ PHP extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/php %{_libdir}/graphviz/php/* +%{_mandir}/mann/gv_php.n* %endif #-- graphviz-python rpm ------------------------------------------- %if %{PYTHON} %package python -Group: Applications/Multimedia -Summary: Python extension for graphviz -Requires: graphviz = %{version}-%{release} python +Group: Applications/Multimedia +Summary: Python extension for graphviz +Requires: graphviz = %{version}-%{release} python %description python Python extension for graphviz. @@ -315,14 +345,15 @@ Python extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/python %{_libdir}/graphviz/python/* +%{_mandir}/mann/gv_python.n* %endif #-- graphviz-ruby rpm --------------------------------------------- %if %{RUBY} %package ruby -Group: Applications/Multimedia -Summary: Ruby extension for graphviz -Requires: graphviz = %{version}-%{release} ruby +Group: Applications/Multimedia +Summary: Ruby extension for graphviz +Requires: graphviz = %{version}-%{release} ruby %description ruby Ruby extension for graphviz. @@ -331,14 +362,15 @@ Ruby extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/ruby %{_libdir}/graphviz/ruby/* +%{_mandir}/mann/gv_ruby.n* %endif #-- graphviz-tcl rpm ---------------------------------------------- %if %{TCL} %package tcl -Group: Applications/Multimedia -Summary: Tcl extension & tools for graphviz -Requires: graphviz = %{version}-%{release} tcl >= 8.3 tk +Group: Applications/Multimedia +Summary: Tcl extension & tools for graphviz +Requires: graphviz = %{version}-%{release} tcl >= 8.3 tk %description tcl Various tcl packages (extensions) for the graphviz tools. @@ -349,14 +381,17 @@ Various tcl packages (extensions) for the graphviz tools. %{_libdir}/graphviz/tcl/* %{_libdir}/graphviz/pkgIndex.tcl %{_datadir}/graphviz/demo -%{_mandir}/mann/*.n* +# hack to include gv_tcl.n only if available +# always includes tcldot.n, gdtclft.n +%{_mandir}/mann/*tcl*.n* +%{_mandir}/mann/tkspline.n* %endif #-- graphviz-devel rpm -------------------------------------------- %package devel -Group: Development/Libraries -Summary: Development package for graphviz -Requires: graphviz = %{version}-%{release} pkgconfig +Group: Development/Libraries +Summary: Development package for graphviz +Requires: graphviz = %{version}-%{release} pkgconfig %description devel A collection of tools for the manipulation and layout @@ -375,8 +410,8 @@ This package contains development files for graphviz. #-- graphviz-graphs rpm ------------------------------------------- %package graphs -Group: Applications/Multimedia -Summary: Demo graphs for graphviz +Group: Applications/Multimedia +Summary: Demo graphs for graphviz %description graphs Some demo graphs for graphviz. @@ -388,8 +423,8 @@ Some demo graphs for graphviz. #-- graphviz-doc rpm ---------------------------------------------- %package doc -Group: Documentation -Summary: PDF and HTML documents for graphviz +Group: Documentation +Summary: PDF and HTML documents for graphviz %description doc Provides some additional PDF and HTML documentation for graphviz. @@ -402,78 +437,89 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build +%if ! %{SHARP} +%define NO_SHARP --disable-sharp +%endif +%if ! %{GUILE} +%define NO_GUILE --disable-guile +%endif +%if ! %{_IO} +%define NO_IO --disable-io +%endif +%if ! %{JAVA} +%define NO_JAVA --disable-java +%endif +%if ! %{LUA} +%define NO_LUA --disable-lua +%endif +%if ! %{OCAML} +%define NO_OCAML --disable-ocaml +%endif +%if ! %{PERL} +%define NO_PERL --disable-perl +%endif +%if ! %{PHP} +%define NO_PHP --disable-php +%endif +%if ! %{PYTHON} +%define NO_PYTHON --disable-python +%endif +%if ! %{RUBY} +%define NO_RUBY --disable-ruby +%endif +%if ! %{TCL} +%define NO_TCL --disable-tcl +%endif + # XXX ix86 only used to have -ffast-math, let's use everywhere %{expand: %%define optflags %{optflags} -ffast-math} + # %%configure is broken in RH7.3 rpmbuild CFLAGS="$RPM_OPT_FLAGS" \ ./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --includedir=%{_includedir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ - --with-x \ - --disable-static \ - --disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING} -%__make %{?_smp_mflags} + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --includedir=%{_includedir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ + --with-x \ + --disable-static \ + --disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING} %{PANGOCAIRO} \ + %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} \ + %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL} +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT __doc -%{__make} \ - DESTDIR=$RPM_BUILD_ROOT \ - docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \ - pkgconfigdir=%{_libdir}/pkgconfig \ - install -find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/* -cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc -rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc +rm -rf %{buildroot} __doc +make DESTDIR=%{buildroot} \ + docdir=%{buildroot}%{_docdir}/%{name} \ + pkgconfigdir=%{_libdir}/pkgconfig \ + install +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +chmod -x %{buildroot}%{_datadir}/%{name}/lefty/* +cp -a %{buildroot}%{_datadir}/%{name}/doc __doc +rm -rf %{buildroot}%{_datadir}/%{name}/doc %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog -* Thu Jul 12 2007 Patrick "Jima" Laughton 2.12-8 -- Patch to fix BZ#241790 (thanks John!) - -* Sat May 05 2007 Patrick "Jima" Laughton 2.12-7 -- Patch to fix BZ#237496 -- Disabling relocatability to work around BZ#237082 -- Disabling -ocaml and -sharp subpackages for ppc64 to remedy BZ#239078 - -* Wed Feb 14 2007 Patrick "Jima" Laughton 2.12-6 -- Removed patch, as tcl/tk got rolled back to 8.4 - -* Wed Feb 07 2007 Patrick "Jima" Laughton 2.12-5 -- Added patch for slightly broken tk 8.5 - -* Thu Feb 01 2007 Patrick "Jima" Laughton 2.12-4 -- Bump-n-build due to tk upgrade - -* Wed Jan 24 2007 Patrick "Jima" Laughton 2.12-3 -- Added running of /sbin/ldconfig in post/postun (and Reqs) -- Minor edit to -gd summary -- Removed explicit dependency on libgcj in -java -- Added BR for ruby (not pulled in by ruby-devel!) -- Cleanup of spaces/tabs to minimize rpmlint warnings - -* Wed Dec 13 2006 Patrick "Jima" Laughton 2.12-2 -- Use of RPM_INSTALL_PREFIX0 in %%post requires Prefix: to be set - -* Mon Dec 11 2006 Patrick "Jima" Laughton 2.12-1 -- Fixed dist tag -- Fixed minor typo in -lua description (BZ#218191) -- Added upstream-supplied "php5" patch (due to newer swig) -- Added BR: java-devel & R: java +* Thu Aug 23 2007 Patrick "Jima" Laughton 2.14.1-2 +- Added perl-devel to BR for F7+ +* Wed Aug 15 2007 John Ellson +- release 2.14.1 - see ChangeLog for details +* Wed Aug 2 2007 John Ellson +- release 2.14 - see ChangeLog for details +* Fri Mar 16 2007 Stephen North +- remove xorg-X11-devel from rhel >= 5 +* Mon Dec 11 2006 John Ellson +- fix graphviz-lua description (Fedora BZ#218191) * Tue Sep 13 2005 John Ellson - split out language bindings into their own rpms so that main rpm doesn't depend on (e.g.) ocaml From 796afabb953e14c03de2fcb0c72bdef96969236f Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 5 Sep 2007 03:07:20 +0000 Subject: [PATCH 04/31] - Patch to resurrect arith.h --- graphviz-arith.patch | 29 +++++++++++++++++++++++++++++ graphviz.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 graphviz-arith.patch diff --git a/graphviz-arith.patch b/graphviz-arith.patch new file mode 100644 index 0000000..126efeb --- /dev/null +++ b/graphviz-arith.patch @@ -0,0 +1,29 @@ +Index: lib/common/Makefile.am +=================================================================== +RCS file: /home/cvsroot/graphviz2/lib/common/Makefile.am,v +retrieving revision 1.46 +retrieving revision 1.47 +diff -u -r1.46 -r1.47 +--- lib/common/Makefile.am 26 Jul 2007 13:53:25 -0000 1.46 ++++ lib/common/Makefile.am 4 Sep 2007 23:39:07 -0000 1.47 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.am,v 1.46 2007/07/26 13:53:25 erg Exp $ $Revision: 1.46 $ ++# $Id: Makefile.am,v 1.47 2007/09/04 23:39:07 ellson Exp $ $Revision: 1.47 $ + ## Process this file with automake to produce Makefile.in + + AM_CPPFLAGS = \ +@@ -14,11 +14,10 @@ + AM_CFLAGS = -D_BLD_common=1 + endif + +-pkginclude_HEADERS = geom.h color.h types.h textpara.h usershape.h ++pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h + noinst_HEADERS = render.h utils.h memory.h \ +- geomprocs.h colorprocs.h colortbl.h entities.h \ +- logic.h arith.h globals.h \ +- const.h macros.h htmllex.h htmltable.h pointset.h ++ geomprocs.h colorprocs.h colortbl.h entities.h globals.h \ ++ logic.h const.h macros.h htmllex.h htmltable.h pointset.h + noinst_LTLIBRARIES = libcommon_C.la + + if WITH_CODEGENS diff --git a/graphviz.spec b/graphviz.spec index 6a73106..da31a14 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.14.1 -%define truerelease 2 +%define truerelease 3 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -18,6 +18,7 @@ Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.14.1.tar.gz +Patch0: %{name}-arith.patch #-- feature and package selection ------------------------------------------- # depends on %dist and %fedora (or %rhl or %rhel) which are set @@ -437,6 +438,7 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q +%patch0 -p0 %build %if ! %{SHARP} @@ -509,6 +511,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Tue Sep 04 2007 Patrick "Jima" Laughton 2.14.1-3 +- Patch to resurrect arith.h + * Thu Aug 23 2007 Patrick "Jima" Laughton 2.14.1-2 - Added perl-devel to BR for F7+ From b25fcdc4df46e7736a171761f2ed748ef87e7f82 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 28 Nov 2007 18:17:02 +0000 Subject: [PATCH 05/31] - New upstream release - Remove arith.h patch --- .cvsignore | 2 +- graphviz.spec | 97 +++++++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 88 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index c2595cd..ef4e22e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -graphviz-2.14.1.tar.gz +graphviz-2.16.tar.gz diff --git a/graphviz.spec b/graphviz.spec index da31a14..c980742 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -6,9 +6,9 @@ #-- Global graphviz rpm and src.rpm tags------------------------------------- Name: graphviz Summary: Graph Visualization Tools -Version: 2.14.1 +Version: 2.16 -%define truerelease 3 +%define truerelease 1 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -17,8 +17,11 @@ Release: %{?release} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ -Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.14.1.tar.gz -Patch0: %{name}-arith.patch +Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz + +# graphviz is relocatable - Caution: this feature is used in AT&T, +# but probably will not be supported in Redhat/Fedora/Centos distros +#Prefix: /usr #-- feature and package selection ------------------------------------------- # depends on %dist and %fedora (or %rhl or %rhel) which are set @@ -38,8 +41,10 @@ Patch0: %{name}-arith.patch %define TCL 1 %define IPSEPCOLA --without-ipsepcola %define MYLIBGD --with-mylibgd -%define MING --without-ming %define PANGOCAIRO --without-pangocairo +%define DEVIL 0 +%define MING 0 +%define GDK_PIXBUF --without-gdk-pixbuf # SuSE uses a different mechanism to generate BuildRequires # norootforbuild @@ -89,6 +94,11 @@ BuildRequires: perl php-devel ruby ruby-devel guile-devel python-devel BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif +%if "%rhel" >= "6" +%define MYLIBGD --without-mylibgd +%define GDK_PIXBUF --with-gdk-pixbuf +BuildRequires: gd gd-devel perl-devel +%endif %endif #-- Fedora specific Build Requirements -------------------------------------- @@ -130,8 +140,14 @@ BuildRequires: mono-core ocaml BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel %endif %if "%fedora" >= "7" -BuildRequires: gd gd-devel perl-devel +%define DEVIL 1 %define MYLIBGD --without-mylibgd +%define GDK_PIXBUF --with-gdk-pixbuf +BuildRequires: gd gd-devel perl-devel DevIL-devel +%endif +%if "%fedora" >= "9" +%define MING 1 +BuildRequires: ming ming-devel %endif %endif @@ -169,6 +185,12 @@ fi %{_datadir}/graphviz/lefty %exclude %{_libdir}/graphviz/*/* %exclude %{_libdir}/graphviz/libgvplugin_gd.* +%if %{DEVIL} +%exclude %{_libdir}/graphviz/libgvplugin_devil.* +%endif +%if %{MING} +%exclude %{_libdir}/graphviz/libgvplugin_ming.* +%endif #-- graphviz-gd rpm -------------------------------------------------- %package gd @@ -196,6 +218,50 @@ based renderer.) %files gd %{_libdir}/graphviz/libgvplugin_gd.so.* +#-- graphviz-devil rpm -------------------------------------------------- +%if %{DEVIL} +%package devil +Group: Applications/Multimedia +Summary: Graphviz plugin for renderers based on DevIL +Requires: graphviz = %{version}-%{release} + +%description devil +Graphviz plugin for renderers based on DevIL. (Unless you absolutely have +to use BMP, TIF, or TGA, you are recommended to use the PNG format instead +support directly by the cairo+pango based renderer in the base graphviz rpm.) + +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post devil +%{_bindir}/dot -c + +%postun devil +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : + +%files devil +%{_libdir}/graphviz/libgvplugin_devil.so.* +%endif + +#-- graphviz-ming rpm -------------------------------------------------- +%if %{MING} +%package ming +Group: Applications/Multimedia +Summary: Graphviz plugin for flash renderer based on ming +Requires: graphviz = %{version}-%{release} + +%description ming +Graphviz plugin for -Tswf (flash) renderer based on ming. + +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post ming +%{_bindir}/dot -c + +%postun ming +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : + +%files ming +%{_libdir}/graphviz/libgvplugin_ming.so.* +%endif + #-- graphviz-sharp rpm -------------------------------------------- %if %{SHARP} %package sharp @@ -438,7 +504,6 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -%patch0 -p0 %build %if ! %{SHARP} @@ -474,6 +539,12 @@ Provides some additional PDF and HTML documentation for graphviz. %if ! %{TCL} %define NO_TCL --disable-tcl %endif +%if ! %{DEVIL} +%define NO_DEVIL --without-devil +%endif +%if ! %{MING} +%define NO_MING --without-ming +%endif # XXX ix86 only used to have -ffast-math, let's use everywhere %{expand: %%define optflags %{optflags} -ffast-math} @@ -488,10 +559,10 @@ CFLAGS="$RPM_OPT_FLAGS" \ --datadir=%{_datadir} \ --mandir=%{_mandir} \ --with-x \ - --disable-static \ - --disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING} %{PANGOCAIRO} \ - %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} \ - %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL} + --disable-static \ + --disable-dependency-tracking \ + %{MYLIBGD} %{IPSEPCOLA} %{PANGOCAIRO} %{GDK_PIXBUF} \ + %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING} make %{?_smp_mflags} %install @@ -511,6 +582,10 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Wed Nov 28 2007 Patrick "Jima" Laughton 2.16-1 +- New upstream release +- Remove arith.h patch + * Tue Sep 04 2007 Patrick "Jima" Laughton 2.14.1-3 - Patch to resurrect arith.h diff --git a/sources b/sources index f497e47..e576fc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c56ba28d4e24f3ddd5e8fdb58deba70 graphviz-2.14.1.tar.gz +c8cac2c66a52e37a2be9290d4f38e525 graphviz-2.16.tar.gz From 150c53f5473835aea987093ab3ef3e6db5b94028 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 12 Dec 2007 18:25:45 +0000 Subject: [PATCH 06/31] - What the heck? Can't BR stuff that hasn't even gotten reviewed yet. (upstream wackiness) --- graphviz.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index c980742..a64faa4 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16 -%define truerelease 1 +%define truerelease 2 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -145,10 +145,10 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel %define GDK_PIXBUF --with-gdk-pixbuf BuildRequires: gd gd-devel perl-devel DevIL-devel %endif -%if "%fedora" >= "9" -%define MING 1 -BuildRequires: ming ming-devel -%endif +#%if "%fedora" >= "9" +#%define MING 1 +#BuildRequires: ming ming-devel +#%endif %endif #-- main graphviz rpm ------------------------------------------------ @@ -582,6 +582,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Wed Dec 12 2007 Patrick "Jima" Laughton 2.16-2 +- What the heck? Can't BR stuff that hasn't even gotten reviewed yet. + * Wed Nov 28 2007 Patrick "Jima" Laughton 2.16-1 - New upstream release - Remove arith.h patch From a605966ecf4e61c509f0a6712cac111410c4ceb9 Mon Sep 17 00:00:00 2001 From: alexlan Date: Fri, 4 Jan 2008 04:22:28 +0000 Subject: [PATCH 07/31] - Rebuild against new Tcl 8.5 --- graphviz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index a64faa4..6b06c55 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16 -%define truerelease 2 +%define truerelease 3 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -582,6 +582,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Thu Jan 3 2008 Alex Lancaster - 2.16-3 +- Rebuild against new Tcl 8.5 + * Wed Dec 12 2007 Patrick "Jima" Laughton 2.16-2 - What the heck? Can't BR stuff that hasn't even gotten reviewed yet. From 450c3df36f53e580a2b8d471814c943cab429724 Mon Sep 17 00:00:00 2001 From: alexlan Date: Fri, 4 Jan 2008 04:28:39 +0000 Subject: [PATCH 08/31] Bump spec, tag conflict --- graphviz.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 6b06c55..635c90d 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16 -%define truerelease 3 +%define truerelease 3.1 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -582,7 +582,7 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog -* Thu Jan 3 2008 Alex Lancaster - 2.16-3 +* Thu Jan 3 2008 Alex Lancaster - 2.16-3.1 - Rebuild against new Tcl 8.5 * Wed Dec 12 2007 Patrick "Jima" Laughton 2.16-2 From 3eaeba865af988c008c4bde2bfc7ce03d48230be Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Fri, 4 Jan 2008 05:11:28 +0000 Subject: [PATCH 09/31] - Re-added tcl/tk 8.5 patch - Tweaked ming stuff FWIW, it won't build with this patch, either, but it still helps. :-) --- graphviz-tk8.5.patch | 178 +++++++++++++++---------------------------- graphviz.spec | 14 +++- 2 files changed, 71 insertions(+), 121 deletions(-) diff --git a/graphviz-tk8.5.patch b/graphviz-tk8.5.patch index ab654d5..c204047 100644 --- a/graphviz-tk8.5.patch +++ b/graphviz-tk8.5.patch @@ -1,37 +1,37 @@ -diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure ---- graphviz-2.12/configure 2006-12-04 16:02:10.000000000 -0600 -+++ graphviz-2.12-patched/configure 2007-02-07 08:20:19.000000000 -0600 -@@ -26251,8 +26251,8 @@ - fi; +diff -urN graphviz-2.16.orig/configure graphviz-2.16/configure +--- graphviz-2.16.orig/configure 2007-11-09 23:41:41.000000000 -0600 ++++ graphviz-2.16/configure 2008-01-03 08:52:00.000000000 -0600 +@@ -28003,8 +28003,8 @@ + if test "x$TCLSH" = "x"; then - # Extract the first word of "tclsh8.4", so it can be a program name with args. -set dummy tclsh8.4; ac_word=$2 + # Extract the first word of "tclsh8.5", so it can be a program name with args. +set dummy tclsh8.5; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_TCLSH+set}" = set; then -@@ -26291,8 +26291,8 @@ - fi +@@ -28044,8 +28044,8 @@ + if test "x$TCLSH" = "x"; then - # Extract the first word of "tclsh8.3", so it can be a program name with args. -set dummy tclsh8.3; ac_word=$2 + # Extract the first word of "tclsh8.4", so it can be a program name with args. +set dummy tclsh8.4; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_TCLSH+set}" = set; then -@@ -26331,7 +26331,47 @@ - fi +@@ -28085,7 +28085,48 @@ + if test "x$TCLSH" = "x"; then - # Extract the first word of "tclsh", so it can be a program name with args. + # Extract the first word of "tclsh8.3", so it can be a program name with args. +set dummy tclsh8.3; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_TCLSH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else @@ -46,60 +46,72 @@ diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done ++IFS=$as_save_IFS + + ;; +esac +fi +TCLSH=$ac_cv_path_TCLSH -+ +if test -n "$TCLSH"; then -+ echo "$as_me:$LINENO: result: $TCLSH" >&5 -+echo "${ECHO_T}$TCLSH" >&6 ++ { echo "$as_me:$LINENO: result: $TCLSH" >&5 ++echo "${ECHO_T}$TCLSH" >&6; } +else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } +fi + ++ + if test "x$TCLSH" = "x"; then + # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -@@ -26370,6 +26410,7 @@ - echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +@@ -28125,6 +28166,7 @@ fi + + fi fi fi + if test "x$TCLSH" = "x"; then +@@ -28413,8 +28455,8 @@ fi -@@ -26674,8 +26715,8 @@ - WISH=$withval - fi; + if test "x$WISH" = "x"; then - # Extract the first word of "wish8.4", so it can be a program name with args. -set dummy wish8.4; ac_word=$2 + # Extract the first word of "wish8.5", so it can be a program name with args. +set dummy wish8.5; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_WISH+set}" = set; then -@@ -26714,7 +26755,47 @@ - fi +@@ -28454,8 +28496,8 @@ + if test "x$WISH" = "x"; then - # Extract the first word of "wish8.3", so it can be a program name with args. -+ # Extract the first word of "wish8.4", so it can be a program name with args. +-set dummy wish8.3; ac_word=$2 ++ # Extract the first word of "wish8.4", so it can be a program name with args. +set dummy wish8.4; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_WISH+set}" = set; then +@@ -28495,7 +28537,48 @@ + + + if test "x$WISH" = "x"; then +- # Extract the first word of "wish", so it can be a program name with args. ++ # Extract the first word of "wish8.3", so it can be a program name with args. ++set dummy wish8.3; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_WISH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else @@ -114,52 +126,42 @@ diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done ++IFS=$as_save_IFS + + ;; +esac +fi +WISH=$ac_cv_path_WISH -+ +if test -n "$WISH"; then -+ echo "$as_me:$LINENO: result: $WISH" >&5 -+echo "${ECHO_T}$WISH" >&6 ++ { echo "$as_me:$LINENO: result: $WISH" >&5 ++echo "${ECHO_T}$WISH" >&6; } +else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } +fi + -+ if test "x$WISH" = "x"; then -+ # Extract the first word of "wish8.3", so it can be a program name with args. - set dummy wish8.3; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -@@ -26753,8 +26834,8 @@ - echo "${ECHO_T}no" >&6 - fi - -- if test "x$WISH" = "x"; then -- # Extract the first word of "wish", so it can be a program name with args. -+ if test "x$WISH" = "x"; then ++ ++ if test "x$WISH" = "x"; then + # Extract the first word of "wish", so it can be a program name with args. set dummy wish; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -@@ -26793,6 +26874,7 @@ - echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +@@ -28535,6 +28618,7 @@ fi + + fi fi fi fi -@@ -26815,7 +26897,7 @@ +@@ -28557,7 +28641,7 @@ WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then @@ -168,65 +170,7 @@ diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure else if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include -@@ -33490,7 +33572,7 @@ - # ----------------------------------- - # tkInt.h - if test -f "$TK_SRC_DIR/generic/tkInt.h"; then --TKINT_INCLUDES="-I$TK_SRC_DIR/generic" -+TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix" - else - if test -f "/usr/include/tkInt.h"; then - TKINT_INCLUDES="" -diff -urN graphviz-2.12/configure.ac graphviz-2.12-patched/configure.ac ---- graphviz-2.12/configure.ac 2006-12-04 15:11:58.000000000 -0600 -+++ graphviz-2.12-patched/configure.ac 2007-02-07 08:20:02.000000000 -0600 -@@ -755,11 +755,14 @@ - TCLSH=$withval,) - - if test "x$TCLSH" = "x"; then -- AC_PATH_PROG(TCLSH,tclsh8.4) -+ AC_PATH_PROG(TCLSH,tclsh8.5) - if test "x$TCLSH" = "x"; then -- AC_PATH_PROG(TCLSH,tclsh8.3) -+ AC_PATH_PROG(TCLSH,tclsh8.4) - if test "x$TCLSH" = "x"; then -- AC_PATH_PROG(TCLSH,tclsh) -+ AC_PATH_PROG(TCLSH,tclsh8.3) -+ if test "x$TCLSH" = "x"; then -+ AC_PATH_PROG(TCLSH,tclsh) -+ fi - fi - fi - fi -@@ -904,11 +907,14 @@ - [ --with-wish=PROG build graphviz for specific wish], - WISH=$withval,) - if test "x$WISH" = "x"; then -- AC_PATH_PROG(WISH,wish8.4) -+ AC_PATH_PROG(WISH,wish8.5) - if test "x$WISH" = "x"; then -- AC_PATH_PROG(WISH,wish8.3) -- if test "x$WISH" = "x"; then -- AC_PATH_PROG(WISH,wish) -+ AC_PATH_PROG(WISH,wish8.4) -+ if test "x$WISH" = "x"; then -+ AC_PATH_PROG(WISH,wish8.3) -+ if test "x$WISH" = "x"; then -+ AC_PATH_PROG(WISH,wish) -+ fi - fi - fi - fi -@@ -930,7 +936,7 @@ - WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` - - if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then -- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic" -+ TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix" - else - if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then - TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include -@@ -1673,7 +1679,7 @@ +@@ -34721,7 +34805,7 @@ # ----------------------------------- # tkInt.h if test -f "$TK_SRC_DIR/generic/tkInt.h"; then diff --git a/graphviz.spec b/graphviz.spec index 635c90d..6333cea 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16 -%define truerelease 3.1 +%define truerelease 3.2 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -18,6 +18,7 @@ Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz +Patch0: %{name}-tk8.5.patch # graphviz is relocatable - Caution: this feature is used in AT&T, # but probably will not be supported in Redhat/Fedora/Centos distros @@ -145,10 +146,10 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel %define GDK_PIXBUF --with-gdk-pixbuf BuildRequires: gd gd-devel perl-devel DevIL-devel %endif -#%if "%fedora" >= "9" -#%define MING 1 +%if "%fedora" >= "9" +%define MING 0 #BuildRequires: ming ming-devel -#%endif +%endif %endif #-- main graphviz rpm ------------------------------------------------ @@ -504,6 +505,7 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q +%patch0 -p1 %build %if ! %{SHARP} @@ -582,6 +584,10 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Thu Jan 3 2008 Patrick "Jima" Laughton 2.16-3.2 +- Re-added tcl/tk 8.5 patch +- Tweaked ming stuff + * Thu Jan 3 2008 Alex Lancaster - 2.16-3.1 - Rebuild against new Tcl 8.5 From 34b34a56ce9b079a0baebc148f00532879a4700a Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Tue, 12 Feb 2008 17:53:11 +0000 Subject: [PATCH 10/31] - Added upstream-provided patch for building under GCC 4.3 (thanks John!) --- graphviz-gcc43.patch | 32 ++++++++++++++++++++++++++++++++ graphviz.spec | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 graphviz-gcc43.patch diff --git a/graphviz-gcc43.patch b/graphviz-gcc43.patch new file mode 100644 index 0000000..180b703 --- /dev/null +++ b/graphviz-gcc43.patch @@ -0,0 +1,32 @@ +--- graphviz-2.16/lib/vpsc/generate-constraints.cpp.orig 2008-02-11 13:42:16.000000000 -0500 ++++ graphviz-2.16/lib/vpsc/generate-constraints.cpp 2008-02-11 13:05:19.000000000 -0500 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include "generate-constraints.h" + #include "constraint.h" + +--- graphviz-2.16/lib/vpsc/csolve_VPSC.cpp.orig 2008-02-11 13:42:00.000000000 -0500 ++++ graphviz-2.16/lib/vpsc/csolve_VPSC.cpp 2008-02-11 13:05:19.000000000 -0500 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include "csolve_VPSC.h" + extern "C" { +--- graphviz-2.16/tclpkg/gv/gv.i.orig 2008-02-11 13:41:21.000000000 -0500 ++++ graphviz-2.16/tclpkg/gv/gv.i 2008-02-11 13:38:57.000000000 -0500 +@@ -25,6 +25,9 @@ + #undef TRUE + #undef FALSE + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif + #include "gvc.h" + %} + diff --git a/graphviz.spec b/graphviz.spec index 6333cea..53f522b 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16 -%define truerelease 3.2 +%define truerelease 3.3 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -19,6 +19,7 @@ License: CPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Patch0: %{name}-tk8.5.patch +Patch1: %{name}-gcc43.patch # graphviz is relocatable - Caution: this feature is used in AT&T, # but probably will not be supported in Redhat/Fedora/Centos distros @@ -506,6 +507,7 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %if ! %{SHARP} @@ -584,6 +586,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Tue Feb 12 2008 Patrick "Jima" Laughton 2.16-3.3 +- Added upstream-provided patch for building under GCC 4.3 (thanks John!) + * Thu Jan 3 2008 Patrick "Jima" Laughton 2.16-3.2 - Re-added tcl/tk 8.5 patch - Tweaked ming stuff From 831c618bd82ed98af4c97674db670bf88955cca8 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Mon, 3 Mar 2008 16:05:19 +0000 Subject: [PATCH 11/31] - New upstream release (fixes BZ#433205, BZ#427376) - Merged spec changes in from upstream - Added patch from BZ#432683 --- .cvsignore | 2 +- graphviz-multilib.patch | 14 ++++++++++ graphviz.spec | 60 +++++++++++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 graphviz-multilib.patch diff --git a/.cvsignore b/.cvsignore index ef4e22e..d3610e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -graphviz-2.16.tar.gz +graphviz-2.16.1.tar.gz diff --git a/graphviz-multilib.patch b/graphviz-multilib.patch new file mode 100644 index 0000000..898b0cf --- /dev/null +++ b/graphviz-multilib.patch @@ -0,0 +1,14 @@ +diff -urN graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c +--- graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c 2007-11-09 17:31:43.000000000 -0600 ++++ graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c 2008-03-03 09:55:01.000000000 -0600 +@@ -154,8 +154,8 @@ + logical_rect.height = 0; + + textlayout_scale = POINTS_PER_INCH / (FONT_DPI * PANGO_SCALE); +- para->width = logical_rect.width * textlayout_scale; +- para->height = logical_rect.height * textlayout_scale; ++ para->width = ROUND(logical_rect.width * textlayout_scale); ++ para->height = ROUND(logical_rect.height * textlayout_scale); + + /* The y offset from baseline to 0,0 of the bitmap representation */ + iter = pango_layout_get_iter (layout); diff --git a/graphviz.spec b/graphviz.spec index 53f522b..0ac500b 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,4 +1,4 @@ -# $Id: graphviz.spec.in,v 1.117 2007/08/16 01:53:22 ellson Exp $ $Revision: 1.117 $ +# $Id: graphviz.spec.in,v 1.135 2007/12/12 19:26:17 ellson Exp $ $Revision: 1.135 $ # graphviz.spec. Generated from graphviz.spec.in by configure. # Note: pre gd-2.0.34 graphviz uses its own gd tree with gif support and other fixes @@ -6,9 +6,9 @@ #-- Global graphviz rpm and src.rpm tags------------------------------------- Name: graphviz Summary: Graph Visualization Tools -Version: 2.16 +Version: 2.16.1 -%define truerelease 3.3 +%define truerelease 0.2 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -20,6 +20,7 @@ URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Patch0: %{name}-tk8.5.patch Patch1: %{name}-gcc43.patch +Patch2: %{name}-multilib.patch # graphviz is relocatable - Caution: this feature is used in AT&T, # but probably will not be supported in Redhat/Fedora/Centos distros @@ -40,6 +41,7 @@ Patch1: %{name}-gcc43.patch %define PHP 0 %define PYTHON 0 %define RUBY 0 +%define R_LANG 0 %define TCL 1 %define IPSEPCOLA --without-ipsepcola %define MYLIBGD --with-mylibgd @@ -84,11 +86,10 @@ BuildRequires: xorg-x11-devel %if "%rhel" >= "4" # PERL is available earlier, but a suitable SWIG isn't %define PERL 1 -%define PHP 1 %define RUBY 1 %define GUILE 1 %define PYTHON 1 -BuildRequires: perl php-devel ruby ruby-devel guile-devel python-devel +BuildRequires: perl ruby-devel guile-devel python-devel %endif %if "%rhel" >= "5" %define JAVA 1 @@ -97,9 +98,10 @@ BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-d BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif %if "%rhel" >= "6" +%define PHP 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf -BuildRequires: gd gd-devel perl-devel +BuildRequires: gd gd-devel perl-devel php-devel %endif %endif @@ -121,15 +123,15 @@ BuildRequires: xorg-x11-devel %define IPSEPCOLA --with-ipsepcola %endif %if "%fedora" >= "4" -%define PHP 1 %define RUBY 1 %define GUILE 1 %define PYTHON 1 -BuildRequires: libtool-ltdl libtool-ltdl-devel php-devel ruby ruby-devel guile-devel python-devel +BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel %endif %if "%fedora" >= "5" +%define PHP 1 %define JAVA 1 -BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel +BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel %ifnarch ppc64 %define SHARP 1 %define OCAML 1 @@ -147,6 +149,10 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel %define GDK_PIXBUF --with-gdk-pixbuf BuildRequires: gd gd-devel perl-devel DevIL-devel %endif +%if "%fedora" >= "8" +%define R_LANG 1 +BuildRequires: R swig >= 1.3.33 +%endif %if "%fedora" >= "9" %define MING 0 #BuildRequires: ming ming-devel @@ -192,6 +198,7 @@ fi %endif %if %{MING} %exclude %{_libdir}/graphviz/libgvplugin_ming.* +%exclude %{_libdir}/graphviz/*fdb %endif #-- graphviz-gd rpm -------------------------------------------------- @@ -230,7 +237,7 @@ Requires: graphviz = %{version}-%{release} %description devil Graphviz plugin for renderers based on DevIL. (Unless you absolutely have to use BMP, TIF, or TGA, you are recommended to use the PNG format instead -support directly by the cairo+pango based renderer in the base graphviz rpm.) +supported directly by the cairo+pango based renderer in the base graphviz rpm.) # run "dot -c" to generate plugin config in %{_libdir}/graphviz/config %post devil @@ -262,6 +269,7 @@ Graphviz plugin for -Tswf (flash) renderer based on ming. %files ming %{_libdir}/graphviz/libgvplugin_ming.so.* +%{_libdir}/graphviz/*fdb %endif #-- graphviz-sharp rpm -------------------------------------------- @@ -417,6 +425,23 @@ Python extension for graphviz. %{_mandir}/mann/gv_python.n* %endif +#-- graphviz-r rpm --------------------------------------------- +%if %{R_LANG} +%package r +Group: Applications/Multimedia +Summary: R extension for graphviz +Requires: graphviz = %{version}-%{release} r + +%description r +R extension for graphviz. + +%files r +%defattr(-,root,root,-) +%dir %{_libdir}/graphviz/r +%{_libdir}/graphviz/r/* +%{_mandir}/mann/gv_r.n* +%endif + #-- graphviz-ruby rpm --------------------------------------------- %if %{RUBY} %package ruby @@ -508,6 +533,7 @@ Provides some additional PDF and HTML documentation for graphviz. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %if ! %{SHARP} @@ -537,6 +563,9 @@ Provides some additional PDF and HTML documentation for graphviz. %if ! %{PYTHON} %define NO_PYTHON --disable-python %endif +%if ! %{R_LANG} +%define NO_R_LANG --disable-r +%endif %if ! %{RUBY} %define NO_RUBY --disable-ruby %endif @@ -566,7 +595,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ --disable-static \ --disable-dependency-tracking \ %{MYLIBGD} %{IPSEPCOLA} %{PANGOCAIRO} %{GDK_PIXBUF} \ - %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING} + %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_R_LANG} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING} make %{?_smp_mflags} %install @@ -581,11 +610,20 @@ cp -a %{buildroot}%{_datadir}/%{name}/doc __doc rm -rf %{buildroot}%{_datadir}/%{name}/doc %clean +# regression test +cd rtest +make rtest +# clean up temporary installation rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Mon Mar 03 2008 Patrick "Jima" Laughton 2.16.1-0.2 +- New upstream release (fixes BZ#433205, BZ#427376) +- Merged spec changes in from upstream +- Added patch from BZ#432683 + * Tue Feb 12 2008 Patrick "Jima" Laughton 2.16-3.3 - Added upstream-provided patch for building under GCC 4.3 (thanks John!) diff --git a/sources b/sources index e576fc6..19b5a94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8cac2c66a52e37a2be9290d4f38e525 graphviz-2.16.tar.gz +8952fb2a627b38e38ed429a3a9d5cc5c graphviz-2.16.1.tar.gz From 00e5b5e562d9ba290256bc7e9926f04370602a02 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Tue, 4 Mar 2008 18:41:07 +0000 Subject: [PATCH 12/31] - Disable R support --- graphviz.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 0ac500b..ec09786 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16.1 -%define truerelease 0.2 +%define truerelease 0.4 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -150,8 +150,8 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel BuildRequires: gd gd-devel perl-devel DevIL-devel %endif %if "%fedora" >= "8" -%define R_LANG 1 -BuildRequires: R swig >= 1.3.33 +#define R_LANG 1 +#BuildRequires: R-devel swig >= 1.3.33 %endif %if "%fedora" >= "9" %define MING 0 @@ -619,6 +619,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Tue Mar 04 2008 Patrick "Jima" Laughton 2.16.1-0.4 +- Disable R support + * Mon Mar 03 2008 Patrick "Jima" Laughton 2.16.1-0.2 - New upstream release (fixes BZ#433205, BZ#427376) - Merged spec changes in from upstream From edef0aed3076f928bf2dc45dfefea2c756f4572a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 18 Mar 2008 18:15:51 +0000 Subject: [PATCH 13/31] add Requires for versioned perl (libperl.so) --- graphviz.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index ec09786..92ac85a 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16.1 -%define truerelease 0.4 +%define truerelease 0.5 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -379,7 +379,8 @@ Ocaml extension for graphviz. %package perl Group: Applications/Multimedia Summary: Perl extension for graphviz -Requires: graphviz = %{version}-%{release} perl +Requires: graphviz = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl extension for graphviz. @@ -619,6 +620,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Tue Mar 18 2008 Tom "spot" Callaway 2.16.1-0.5 +- add Requires for versioned perl (libperl.so) + * Tue Mar 04 2008 Patrick "Jima" Laughton 2.16.1-0.4 - Disable R support From a862876423f6eab97cc9899fdd3b7043b0c0c670 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 7 Jul 2008 18:12:57 +0000 Subject: [PATCH 14/31] fix conditional comparison --- graphviz.spec | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 92ac85a..40c835f 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16.1 -%define truerelease 0.5 +%define truerelease 0.6 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -73,17 +73,17 @@ BuildRequires: XFree86-devel #-- Red Hat Enterprise Linux specific Build Requirements -------------------- %if 0%{?rhel} %define TCL 1 -%if "%rhel" < "4" +%if}0%{?rhel} < 4 BuildRequires: XFree86-devel %endif -%if "%rhel" >= "3" +%if 0%{?rhel} >= 3 %define IPSEPCOLA --with-ipsepcola BuildRequires: fontconfig-devel tcl-devel tk-devel %endif -%if "%rhel" == "4" +%if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %endif -%if "%rhel" >= "4" +%if 0%{?rhel} >= 4 # PERL is available earlier, but a suitable SWIG isn't %define PERL 1 %define RUBY 1 @@ -91,13 +91,13 @@ BuildRequires: xorg-x11-devel %define PYTHON 1 BuildRequires: perl ruby-devel guile-devel python-devel %endif -%if "%rhel" >= "5" +%if 0%{?rhel} >= 5 %define JAVA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel %endif -%if "%rhel" >= "6" +%if 0%{?rhel} >= 6 %define PHP 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf @@ -110,25 +110,25 @@ BuildRequires: gd gd-devel perl-devel php-devel %define PERL 1 %define TCL 1 BuildRequires: fontconfig-devel tcl-devel tk-devel -%if "%fedora" < "3" +%if 0%{?fedora} < 3 BuildRequires: XFree86-devel %endif -%if "%fedora" == "3" +%if 0%{?fedora} == 3 BuildRequires: xorg-x11-devel %endif -%if "%fedora" == "4" +%if 0%{?fedora} == 4 BuildRequires: xorg-x11-devel %endif -%if "%fedora" >= "3" +%if 0%{?fedora} >= 3 %define IPSEPCOLA --with-ipsepcola %endif -%if "%fedora" >= "4" +%if 0%{?fedora} >= 4 %define RUBY 1 %define GUILE 1 %define PYTHON 1 BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel %endif -%if "%fedora" >= "5" +%if 0%{?fedora} >= 5 %define PHP 1 %define JAVA 1 BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel @@ -138,22 +138,22 @@ BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel li BuildRequires: mono-core ocaml %endif %endif -%if "%fedora" >= "6" +%if 0%{?fedora} >= 6 %define LUA 1 %define PANGOCAIRO --with-pangocairo BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel %endif -%if "%fedora" >= "7" +%if 0%{?fedora} >= 7 %define DEVIL 1 %define MYLIBGD --without-mylibgd %define GDK_PIXBUF --with-gdk-pixbuf BuildRequires: gd gd-devel perl-devel DevIL-devel %endif -%if "%fedora" >= "8" +%if 0%{?fedora} >= 8 #define R_LANG 1 #BuildRequires: R-devel swig >= 1.3.33 %endif -%if "%fedora" >= "9" +%if 0%{?fedora} >= 9 %define MING 0 #BuildRequires: ming ming-devel %endif @@ -620,6 +620,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Mon Jul 7 2008 Tom "spot" Callaway 2.16.1-0.6 +- fix conditional comparison + * Tue Mar 18 2008 Tom "spot" Callaway 2.16.1-0.5 - add Requires for versioned perl (libperl.so) From f9db76eae0486024a2f7957f8f7b70df741983f8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 22 Nov 2008 20:46:56 +0000 Subject: [PATCH 15/31] - respin (libtool) --- graphviz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index 40c835f..3bc363f 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.16.1 -%define truerelease 0.6 +%define truerelease 0.7 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -620,6 +620,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Sat Nov 22 2008 Rex Dieter 2.16.1-0.7 +- respin (libtool) + * Mon Jul 7 2008 Tom "spot" Callaway 2.16.1-0.6 - fix conditional comparison From 0347b3b4ca975dc60f9c97ea682cfe03fb185702 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 24 Nov 2008 22:27:18 +0000 Subject: [PATCH 16/31] 2.20.3 --- .cvsignore | 2 +- graphviz.spec | 41 ++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.cvsignore b/.cvsignore index d3610e0..bdfbb5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -graphviz-2.16.1.tar.gz +graphviz-2.20.3.tar.gz diff --git a/graphviz.spec b/graphviz.spec index 3bc363f..2c2b97f 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -6,9 +6,9 @@ #-- Global graphviz rpm and src.rpm tags------------------------------------- Name: graphviz Summary: Graph Visualization Tools -Version: 2.16.1 +Version: 2.20.3 -%define truerelease 0.7 +%define truerelease 1 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -18,9 +18,6 @@ Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz -Patch0: %{name}-tk8.5.patch -Patch1: %{name}-gcc43.patch -Patch2: %{name}-multilib.patch # graphviz is relocatable - Caution: this feature is used in AT&T, # but probably will not be supported in Redhat/Fedora/Centos distros @@ -150,8 +147,8 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel BuildRequires: gd gd-devel perl-devel DevIL-devel %endif %if 0%{?fedora} >= 8 -#define R_LANG 1 -#BuildRequires: R-devel swig >= 1.3.33 +%define R_LANG 1 +BuildRequires: R-devel swig >= 1.3.33 %endif %if 0%{?fedora} >= 9 %define MING 0 @@ -354,6 +351,7 @@ Lua extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/lua %{_libdir}/graphviz/lua/* +%{_libdir}/lua*/* %{_mandir}/mann/gv_lua.n* %endif @@ -389,6 +387,7 @@ Perl extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/perl %{_libdir}/graphviz/perl/* +%{_libdir}/perl*/* %{_mandir}/mann/gv_perl.n* %endif @@ -406,6 +405,8 @@ PHP extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/php %{_libdir}/graphviz/php/* +%{_libdir}/php*/* +%{_datadir}/php*/* %{_mandir}/mann/gv_php.n* %endif @@ -423,24 +424,25 @@ Python extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/python %{_libdir}/graphviz/python/* +%{_libdir}/python*/* %{_mandir}/mann/gv_python.n* %endif #-- graphviz-r rpm --------------------------------------------- %if %{R_LANG} -%package r +%package R Group: Applications/Multimedia Summary: R extension for graphviz -Requires: graphviz = %{version}-%{release} r +Requires: graphviz = %{version}-%{release} R-core -%description r +%description R R extension for graphviz. -%files r +%files R %defattr(-,root,root,-) -%dir %{_libdir}/graphviz/r -%{_libdir}/graphviz/r/* -%{_mandir}/mann/gv_r.n* +%dir %{_libdir}/graphviz/R +%{_libdir}/graphviz/R/* +%{_mandir}/mann/gv_R.n* %endif #-- graphviz-ruby rpm --------------------------------------------- @@ -457,6 +459,7 @@ Ruby extension for graphviz. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/ruby %{_libdir}/graphviz/ruby/* +%{_libdir}/*ruby*/* %{_mandir}/mann/gv_ruby.n* %endif @@ -474,8 +477,8 @@ Various tcl packages (extensions) for the graphviz tools. %defattr(-,root,root,-) %dir %{_libdir}/graphviz/tcl %{_libdir}/graphviz/tcl/* -%{_libdir}/graphviz/pkgIndex.tcl -%{_datadir}/graphviz/demo +%{_libdir}/tcl*/* +%{_datadir}/graphviz/demo/ # hack to include gv_tcl.n only if available # always includes tcldot.n, gdtclft.n %{_mandir}/mann/*tcl*.n* @@ -532,9 +535,6 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %if ! %{SHARP} @@ -620,6 +620,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Mon Nov 24 2008 Tom "spot" Callaway 2.20.3-1 +- update to 2.20.3 + * Sat Nov 22 2008 Rex Dieter 2.16.1-0.7 - respin (libtool) diff --git a/sources b/sources index 19b5a94..2edf615 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8952fb2a627b38e38ed429a3a9d5cc5c graphviz-2.16.1.tar.gz +4d94c4b809a5c095acfc973d8d207fa9 graphviz-2.20.3.tar.gz From 5462a92027a40181fe5d4f1385e571bf451cae99 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 16:37:11 +0000 Subject: [PATCH 17/31] Rebuild for Python 2.6 --- graphviz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index 2c2b97f..0313644 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -12,7 +12,7 @@ Version: 2.20.3 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} -Release: %{?release} +Release: %{?release}.1 Group: Applications/Multimedia License: CPL @@ -620,6 +620,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.20.3-1.1 +- Rebuild for Python 2.6 + * Mon Nov 24 2008 Tom "spot" Callaway 2.20.3-1 - update to 2.20.3 From 20bf27e646ed9eb33d02b1c6144a5aabafa3d6bf Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 11 Feb 2009 15:29:20 +0000 Subject: [PATCH 18/31] - make it build on s390, s390x (#469044) --- graphviz.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 0313644..74b9afc 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -12,7 +12,7 @@ Version: 2.20.3 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} -Release: %{?release}.1 +Release: %{?release}.2 Group: Applications/Multimedia License: CPL @@ -129,7 +129,7 @@ BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel pytho %define PHP 1 %define JAVA 1 BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel -%ifnarch ppc64 +%ifnarch ppc64 s390 s390x %define SHARP 1 %define OCAML 1 BuildRequires: mono-core ocaml @@ -620,6 +620,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Wed Feb 11 2009 Karsten Hopp 2.20.3-.2 +- make it build on s390, s390x (#469044) + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.20.3-1.1 - Rebuild for Python 2.6 From b2094e5bc5dff35ee2e7cb2db795650f02eab1f7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 00:56:05 +0000 Subject: [PATCH 19/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- graphviz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index 74b9afc..406a272 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -12,7 +12,7 @@ Version: 2.20.3 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} -Release: %{?release}.2 +Release: %{?release}.3 Group: Applications/Multimedia License: CPL @@ -620,6 +620,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 2.20.3-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 11 2009 Karsten Hopp 2.20.3-.2 - make it build on s390, s390x (#469044) From 63496400d7e70d1035809f01430de6e2fa4efb57 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 27 Feb 2009 14:25:33 +0000 Subject: [PATCH 20/31] pick up patches from John Ellson (bz 486045) --- graphviz-2.20.3-configure-php.patch | 13 +++++++++ graphviz-2.20.3-gv.i.patch | 45 +++++++++++++++++++++++++++++ graphviz.spec | 10 ++++++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 graphviz-2.20.3-configure-php.patch create mode 100644 graphviz-2.20.3-gv.i.patch diff --git a/graphviz-2.20.3-configure-php.patch b/graphviz-2.20.3-configure-php.patch new file mode 100644 index 0000000..a2e19b5 --- /dev/null +++ b/graphviz-2.20.3-configure-php.patch @@ -0,0 +1,13 @@ +--- graphviz-2.20.3/configure.orig 2009-02-25 13:14:22.000000000 -0500 ++++ graphviz-2.20.3/configure 2009-02-25 13:15:02.000000000 -0500 +@@ -27376,8 +27376,8 @@ + if test "x$use_swig" != "xYes"; then + use_php="No (swig not available)" + else +- if test `$SWIG -help 2>&1 | $GREP -c '\-php5 *- Generate'` = 0; then +- use_php="No (swig does not support -php5 option)" ++ if test `$SWIG -help 2>&1 | $GREP -c '\-php5* *- Generate'` = 0; then ++ use_php="No (swig does not support -php or -php5 option)" + else + # Extract the first word of "php", so it can be a program name with args. + set dummy php; ac_word=$2 diff --git a/graphviz-2.20.3-gv.i.patch b/graphviz-2.20.3-gv.i.patch new file mode 100644 index 0000000..8f878f9 --- /dev/null +++ b/graphviz-2.20.3-gv.i.patch @@ -0,0 +1,45 @@ +--- graphviz-2.20.3/tclpkg/gv/gv.i.orig 2009-02-25 13:44:36.000000000 -0500 ++++ graphviz-2.20.3/tclpkg/gv/gv.i 2009-02-25 13:46:29.000000000 -0500 +@@ -15,8 +15,22 @@ + **********************************************************/ + + %module gv +-%{ + ++#ifdef SWIGTCL ++// A typemap telling SWIG to ignore an argument for input ++// However, we still need to pass a pointer to the C function ++%typemap(in,numinputs=0) char *outdata (char *temp) { ++ $1 = &temp; ++} ++// A typemap defining how to return an argument by appending it to the result ++%typemap(argout) char *outdata { ++ Tcl_Obj *o = Tcl_NewStringObj($1); ++ Tcl_ListObjAppendElement(interp,$result,o); ++} ++#endif ++ ++ ++%{ + /* some language headers (e.g. php.h, ruby.h) leave these defined */ + #undef PACKAGE_BUGREPORT + #undef PACKAGE_STRING +@@ -371,18 +385,4 @@ + extern bool write(Agraph_t *g, char *filename); + extern bool write(Agraph_t *g, FILE *f); + +- +-#ifdef SWIGTCL +-// A typemap telling SWIG to ignore an argument for input +-// However, we still need to pass a pointer to the C function +-%typemap(in,numinputs=0) char *outdata (char *temp) { +- $1 = &temp; +-} +-// A typemap defining how to return an argument by appending it to the result +-%typemap(argout) char *outdata { +- Tcl_Obj *o = Tcl_NewStringObj($1); +- Tcl_ListObjAppendElement(interp,$result,o); +-} +-#endif +- + %} diff --git a/graphviz.spec b/graphviz.spec index 406a272..966285d 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -8,7 +8,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.20.3 -%define truerelease 1 +%define truerelease 2 %{?distroagnostic: %define release %{truerelease}} %{!?distroagnostic: %define release %{truerelease}%{?dist}} @@ -18,6 +18,9 @@ Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz +Patch0: graphviz-2.20.3-configure-php.patch +Patch1: graphviz-2.20.3-gv.i.patch + # graphviz is relocatable - Caution: this feature is used in AT&T, # but probably will not be supported in Redhat/Fedora/Centos distros @@ -535,6 +538,8 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %if ! %{SHARP} @@ -620,6 +625,9 @@ rm -rf %{buildroot} #-- changelog -------------------------------------------------- %changelog +* Wed Feb 25 2009 John Ellson 2.20.3-2.2 +- fixes for swig changes + * Tue Feb 24 2009 Fedora Release Engineering - 2.20.3-1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 5a3268a8730d25da2fa733e62739140eebdfa7ba Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 3 Mar 2009 01:59:37 +0000 Subject: [PATCH 21/31] fix this package up --- graphviz.spec | 903 +++++++++++++++++++------------------------------- 1 file changed, 337 insertions(+), 566 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 966285d..cdda15d 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,174 +1,238 @@ -# $Id: graphviz.spec.in,v 1.135 2007/12/12 19:26:17 ellson Exp $ $Revision: 1.135 $ -# graphviz.spec. Generated from graphviz.spec.in by configure. +Name: graphviz +Summary: Graph Visualization Tools +Version: 2.20.3 +Release: 3%{?dist} +Group: Applications/Multimedia +License: CPL +URL: http://www.graphviz.org/ +Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz +Patch0: graphviz-2.20.3-configure-php.patch +Patch1: graphviz-2.20.3-gv.i.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 +BuildRequires: /bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig +BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel, python-devel +BuildRequires: libXaw-devel, libSM-devel, libXext-devel, java-devel, php-devel +BuildRequires: cairo-devel >= 1.1.10, pango-devel, gmp-devel, lua-devel, gtk2-devel, libgnomeui-devel +BuildRequires: gd-devel, perl-devel, DevIL-devel, R-devel, swig >= 1.3.33 +%ifnarch ppc64 s390 s390x sparc64 +BuildRequires: mono-core, ocaml +%endif +Requires: urw-fonts +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig -# Note: pre gd-2.0.34 graphviz uses its own gd tree with gif support and other fixes - -#-- Global graphviz rpm and src.rpm tags------------------------------------- -Name: graphviz -Summary: Graph Visualization Tools -Version: 2.20.3 - -%define truerelease 2 -%{?distroagnostic: %define release %{truerelease}} -%{!?distroagnostic: %define release %{truerelease}%{?dist}} - -Release: %{?release}.3 - -Group: Applications/Multimedia -License: CPL -URL: http://www.graphviz.org/ -Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz -Patch0: graphviz-2.20.3-configure-php.patch -Patch1: graphviz-2.20.3-gv.i.patch - - -# graphviz is relocatable - Caution: this feature is used in AT&T, -# but probably will not be supported in Redhat/Fedora/Centos distros -#Prefix: /usr - -#-- feature and package selection ------------------------------------------- -# depends on %dist and %fedora (or %rhl or %rhel) which are set -# in .rpmmacros on each build host - -# Define a default set of features incase none of the conditionals apply -%define SHARP 0 -%define GUILE 0 -%define _IO 0 -%define JAVA 0 -%define LUA 0 -%define OCAML 0 -%define PERL 0 -%define PHP 0 -%define PYTHON 0 -%define RUBY 0 -%define R_LANG 0 -%define TCL 1 -%define IPSEPCOLA --without-ipsepcola -%define MYLIBGD --with-mylibgd -%define PANGOCAIRO --without-pangocairo -%define DEVIL 0 -%define MING 0 -%define GDK_PIXBUF --without-gdk-pixbuf - -# SuSE uses a different mechanism to generate BuildRequires -# norootforbuild -# neededforbuild expat freetype2 freetype2-devel gcc libjpeg libpng-devel-packages tcl tcl-devel tk tk-devel x-devel-packages - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 -BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig - -# This just indicates the requirement for tcl.h, tk.h, but doesn't identify -# where to get them from. In RH9 and earlier they were in the tcl, tk, -# base packages which are always BR'd anyway (above). -BuildRequires: /usr/include/tcl.h /usr/include/tk.h - -#-- Red Hat Linux specific Build Requirements ------------------------------- -%if 0%{?rhl} -%define TCL 1 -BuildRequires: XFree86-devel +# Necessary conditionals +%ifarch ppc64 s390 s390x sparc64 +%global SHARP 0 +%global OCAML 0 +%else +%global SHARP 1 +%global OCAML 1 %endif - -#-- Red Hat Enterprise Linux specific Build Requirements -------------------- -%if 0%{?rhel} -%define TCL 1 -%if}0%{?rhel} < 4 -BuildRequires: XFree86-devel -%endif -%if 0%{?rhel} >= 3 -%define IPSEPCOLA --with-ipsepcola -BuildRequires: fontconfig-devel tcl-devel tk-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?rhel} >= 4 -# PERL is available earlier, but a suitable SWIG isn't -%define PERL 1 -%define RUBY 1 -%define GUILE 1 -%define PYTHON 1 -BuildRequires: perl ruby-devel guile-devel python-devel -%endif -%if 0%{?rhel} >= 5 -%define JAVA 1 -%define PANGOCAIRO --with-pangocairo -BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel -BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel -%endif -%if 0%{?rhel} >= 6 -%define PHP 1 -%define MYLIBGD --without-mylibgd -%define GDK_PIXBUF --with-gdk-pixbuf -BuildRequires: gd gd-devel perl-devel php-devel -%endif -%endif - -#-- Fedora specific Build Requirements -------------------------------------- -%if 0%{?fedora} -%define PERL 1 -%define TCL 1 -BuildRequires: fontconfig-devel tcl-devel tk-devel -%if 0%{?fedora} < 3 -BuildRequires: XFree86-devel -%endif -%if 0%{?fedora} == 3 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?fedora} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?fedora} >= 3 -%define IPSEPCOLA --with-ipsepcola -%endif -%if 0%{?fedora} >= 4 -%define RUBY 1 -%define GUILE 1 -%define PYTHON 1 -BuildRequires: libtool-ltdl libtool-ltdl-devel ruby ruby-devel guile-devel python-devel -%endif -%if 0%{?fedora} >= 5 -%define PHP 1 -%define JAVA 1 -BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel php-devel -%ifnarch ppc64 s390 s390x -%define SHARP 1 -%define OCAML 1 -BuildRequires: mono-core ocaml -%endif -%endif -%if 0%{?fedora} >= 6 -%define LUA 1 -%define PANGOCAIRO --with-pangocairo -BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel -%endif -%if 0%{?fedora} >= 7 -%define DEVIL 1 -%define MYLIBGD --without-mylibgd -%define GDK_PIXBUF --with-gdk-pixbuf -BuildRequires: gd gd-devel perl-devel DevIL-devel -%endif -%if 0%{?fedora} >= 8 -%define R_LANG 1 -BuildRequires: R-devel swig >= 1.3.33 -%endif -%if 0%{?fedora} >= 9 -%define MING 0 -#BuildRequires: ming ming-devel -%endif -%endif - -#-- main graphviz rpm ------------------------------------------------ -Requires: urw-fonts -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig +# Not in Fedora yet. +%global MING 0 %description -A collection of tools for the manipulation and layout -of graphs (as in nodes and edges, not as in barcharts). +A collection of tools for the manipulation and layout of graphs (as in nodes +and edges, not as in barcharts). + +%package devel +Group: Development/Libraries +Summary: Development package for graphviz +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +A collection of tools for the manipulation and layout of graphs (as in nodes +and edges, not as in barcharts). This package contains development files for +graphviz. + +%package devil +Group: Applications/Multimedia +Summary: Graphviz plugin for renderers based on DevIL +Requires: %{name} = %{version}-%{release} + +%description devil +Graphviz plugin for renderers based on DevIL. (Unless you absolutely have +to use BMP, TIF, or TGA, you are recommended to use the PNG format instead +supported directly by the cairo+pango based renderer in the base graphviz rpm.) + +%package doc +Group: Documentation +Summary: PDF and HTML documents for graphviz + +%description doc +Provides some additional PDF and HTML documentation for graphviz. + +%package gd +Group: Applications/Multimedia +Summary: Graphviz plugin for renderers based on gd +Requires: %{name} = %{version}-%{release} +Requires(post): %{_bindir}/dot /sbin/ldconfig +Requires(postun): %{_bindir}/dot /sbin/ldconfig + +%description gd +Graphviz plugin for renderers based on gd. (Unless you absolutely have to use +GIF, you are recommended to use the PNG format instead because of the better +quality anti-aliased lines provided by the cairo+pango based renderer.) + +%package graphs +Group: Applications/Multimedia +Summary: Demo graphs for graphviz + +%description graphs +Some demo graphs for graphviz. + +%package guile +Group: Applications/Multimedia +Summary: Guile extension for graphviz +Requires: %{name} = %{version}-%{release}, guile + +%description guile +Guile extension for graphviz. + +%package java +Group: Applications/Multimedia +Summary: Java extension for graphviz +Requires: %{name} = %{version}-%{release} + +%description java +Java extension for graphviz. + +%package lua +Group: Applications/Multimedia +Summary: Lua extension for graphviz +Requires: %{name} = %{version}-%{release}, lua + +%description lua +Lua extension for graphviz. + +%if %{MING} +%package ming +Group: Applications/Multimedia +Summary: Graphviz plugin for flash renderer based on ming +Requires: %{name} = %{version}-%{release} + +%description ming +Graphviz plugin for -Tswf (flash) renderer based on ming. +%endif + +%if %{OCAML} +%package ocaml +Group: Applications/Multimedia +Summary: Ocaml extension for graphviz +Requires: %{name} = %{version}-%{release}, ocaml + +%description ocaml +Ocaml extension for graphviz. +%endif + +%package perl +Group: Applications/Multimedia +Summary: Perl extension for graphviz +Requires: %{name} = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description perl +Perl extension for graphviz. + +%package php +Group: Applications/Multimedia +Summary: PHP extension for graphviz +Requires: %{name} = %{version}-%{release}, php + +%description php +PHP extension for graphviz. + +%package python +Group: Applications/Multimedia +Summary: Python extension for graphviz +Requires: %{name} = %{version}-%{release}, python + +%description python +Python extension for graphviz. + +%package R +Group: Applications/Multimedia +Summary: R extension for graphviz +Requires: %{name} = %{version}-%{release}, R-core + +%description R +R extension for graphviz. + +%package ruby +Group: Applications/Multimedia +Summary: Ruby extension for graphviz +Requires: %{name} = %{version}-%{release}, ruby + +%description ruby +Ruby extension for graphviz. + +%if %{SHARP} +%package sharp +Group: Applications/Multimedia +Summary: C# extension for graphviz +Requires: %{name} = %{version}-%{release}, mono-core + +%description sharp +C# extension for graphviz. +%endif + +%package tcl +Group: Applications/Multimedia +Summary: Tcl extension & tools for graphviz +Requires: %{name} = %{version}-%{release}, tcl >= 8.3, tk + +%description tcl +Various tcl packages (extensions) for the graphviz tools. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +# %%define NO_IO --disable-io + +# XXX ix86 only used to have -ffast-math, let's use everywhere +%{expand: %%define optflags %{optflags} -ffast-math} +# Hack in the java includes we need +sed -i '/JavaVM.framework/!s/JAVA_INCLUDES=/JAVA_INCLUDES=\"_MY_JAVA_INCLUDES_\"/g' configure +sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linux/|g' configure +%configure --with-x --disable-static --disable-dependency-tracking --without-mylibgd --with-ipsepcola --with-pangocairo --with-gdk-pixbuf \ +%if ! %{SHARP} + --disable-sharp \ +%endif +%if ! %{OCAML} + --disable-ocaml \ +%endif +%if ! %{MING} + --without-ming \ +%endif + +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} __doc +make DESTDIR=%{buildroot} \ + docdir=%{buildroot}%{_docdir}/%{name} \ + pkgconfigdir=%{_libdir}/pkgconfig \ + install +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +chmod -x %{buildroot}%{_datadir}/%{name}/lefty/* +cp -a %{buildroot}%{_datadir}/%{name}/doc __doc +rm -rf %{buildroot}%{_datadir}/%{name}/doc + +%check +%ifnarch ppc64 ppc +# regression test, segfaults on ppc/ppc64, possible endian issues? +cd rtest +make rtest +%endif + +%clean +rm -rf %{buildroot} -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config %post /sbin/ldconfig %{_bindir}/dot -c @@ -180,6 +244,30 @@ if [ $1 -eq 0 ]; then fi /sbin/ldconfig +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post devil +%{_bindir}/dot -c + +%postun devil +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : + +%post gd +/sbin/ldconfig +%{_bindir}/dot -c + +%postun gd +/sbin/ldconfig +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : + +%if %{MING} +# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +%post ming +%{_bindir}/dot -c + +%postun ming +[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : +%endif + %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README @@ -193,438 +281,121 @@ fi %{_datadir}/graphviz/lefty %exclude %{_libdir}/graphviz/*/* %exclude %{_libdir}/graphviz/libgvplugin_gd.* -%if %{DEVIL} %exclude %{_libdir}/graphviz/libgvplugin_devil.* -%endif %if %{MING} %exclude %{_libdir}/graphviz/libgvplugin_ming.* %exclude %{_libdir}/graphviz/*fdb %endif -#-- graphviz-gd rpm -------------------------------------------------- -%package gd -Group: Applications/Multimedia -Summary: Graphviz plugin for renderers based on gd -Requires: graphviz = %{version}-%{release} -Requires(post): %{_bindir}/dot /sbin/ldconfig -Requires(postun): %{_bindir}/dot /sbin/ldconfig - -%description gd -Graphviz plugin for renderers based on gd. (Unless you absolutely have -to use GIF, you are recommended to use the PNG format instead because -of the better quality anti-aliased lines provided by the cairo+pango -based renderer.) - -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post gd -/sbin/ldconfig -%{_bindir}/dot -c - -%postun gd -/sbin/ldconfig -[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : - -%files gd -%{_libdir}/graphviz/libgvplugin_gd.so.* - -#-- graphviz-devil rpm -------------------------------------------------- -%if %{DEVIL} -%package devil -Group: Applications/Multimedia -Summary: Graphviz plugin for renderers based on DevIL -Requires: graphviz = %{version}-%{release} - -%description devil -Graphviz plugin for renderers based on DevIL. (Unless you absolutely have -to use BMP, TIF, or TGA, you are recommended to use the PNG format instead -supported directly by the cairo+pango based renderer in the base graphviz rpm.) - -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post devil -%{_bindir}/dot -c - -%postun devil -[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : - -%files devil -%{_libdir}/graphviz/libgvplugin_devil.so.* -%endif - -#-- graphviz-ming rpm -------------------------------------------------- -%if %{MING} -%package ming -Group: Applications/Multimedia -Summary: Graphviz plugin for flash renderer based on ming -Requires: graphviz = %{version}-%{release} - -%description ming -Graphviz plugin for -Tswf (flash) renderer based on ming. - -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config -%post ming -%{_bindir}/dot -c - -%postun ming -[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : - -%files ming -%{_libdir}/graphviz/libgvplugin_ming.so.* -%{_libdir}/graphviz/*fdb -%endif - -#-- graphviz-sharp rpm -------------------------------------------- -%if %{SHARP} -%package sharp -Group: Applications/Multimedia -Summary: C# extension for graphviz -Requires: graphviz = %{version}-%{release} mono-core - -%description sharp -C# extension for graphviz. - -%files sharp -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/sharp -%{_libdir}/graphviz/sharp/* -%{_mandir}/mann/gv_sharp.n* -%endif - -#-- graphviz-guile rpm -------------------------------------------- -%if %{GUILE} -%package guile -Group: Applications/Multimedia -Summary: Guile extension for graphviz -Requires: graphviz = %{version}-%{release} guile - -%description guile -Guile extension for graphviz. - -%files guile -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/guile -%{_libdir}/graphviz/guile/* -%{_mandir}/mann/gv_guile.n* -%endif - -#-- graphviz-io rpm ----------------------------------------------- -%if %{_IO} -%package io -Group: Applications/Multimedia -Summary: Io extension for graphviz -Requires: graphviz = %{version}-%{release} io - -%description io -Io extension for graphviz. - -%files io -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/io -%{_libdir}/graphviz/io/* -%{_mandir}/mann/gv_io.n* -%endif - -#-- graphviz-java rpm --------------------------------------------- -%if %{JAVA} -%package java -Group: Applications/Multimedia -Summary: Java extension for graphviz -Requires: graphviz = %{version}-%{release} java - -%description java -Java extension for graphviz. - -%files java -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/java -%{_libdir}/graphviz/java/* -%{_mandir}/mann/gv_java.n* -%endif - -#-- graphviz-lua rpm ---------------------------------------------- -%if %{LUA} -%package lua -Group: Applications/Multimedia -Summary: Lua extension for graphviz -Requires: graphviz = %{version}-%{release} lua - -%description lua -Lua extension for graphviz. - -%files lua -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/lua -%{_libdir}/graphviz/lua/* -%{_libdir}/lua*/* -%{_mandir}/mann/gv_lua.n* -%endif - -#-- graphviz-ocaml rpm -------------------------------------------- -%if %{OCAML} -%package ocaml -Group: Applications/Multimedia -Summary: Ocaml extension for graphviz -Requires: graphviz = %{version}-%{release} ocaml - -%description ocaml -Ocaml extension for graphviz. - -%files ocaml -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/ocaml -%{_libdir}/graphviz/ocaml/* -%{_mandir}/mann/gv_ocaml.n* -%endif - -#-- graphviz-perl rpm --------------------------------------------- -%if %{PERL} -%package perl -Group: Applications/Multimedia -Summary: Perl extension for graphviz -Requires: graphviz = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - -%description perl -Perl extension for graphviz. - -%files perl -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/perl -%{_libdir}/graphviz/perl/* -%{_libdir}/perl*/* -%{_mandir}/mann/gv_perl.n* -%endif - -#-- graphviz-php rpm ---------------------------------------------- -%if %{PHP} -%package php -Group: Applications/Multimedia -Summary: PHP extension for graphviz -Requires: graphviz = %{version}-%{release} php - -%description php -PHP extension for graphviz. - -%files php -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/php -%{_libdir}/graphviz/php/* -%{_libdir}/php*/* -%{_datadir}/php*/* -%{_mandir}/mann/gv_php.n* -%endif - -#-- graphviz-python rpm ------------------------------------------- -%if %{PYTHON} -%package python -Group: Applications/Multimedia -Summary: Python extension for graphviz -Requires: graphviz = %{version}-%{release} python - -%description python -Python extension for graphviz. - -%files python -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/python -%{_libdir}/graphviz/python/* -%{_libdir}/python*/* -%{_mandir}/mann/gv_python.n* -%endif - -#-- graphviz-r rpm --------------------------------------------- -%if %{R_LANG} -%package R -Group: Applications/Multimedia -Summary: R extension for graphviz -Requires: graphviz = %{version}-%{release} R-core - -%description R -R extension for graphviz. - -%files R -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/R -%{_libdir}/graphviz/R/* -%{_mandir}/mann/gv_R.n* -%endif - -#-- graphviz-ruby rpm --------------------------------------------- -%if %{RUBY} -%package ruby -Group: Applications/Multimedia -Summary: Ruby extension for graphviz -Requires: graphviz = %{version}-%{release} ruby - -%description ruby -Ruby extension for graphviz. - -%files ruby -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/ruby -%{_libdir}/graphviz/ruby/* -%{_libdir}/*ruby*/* -%{_mandir}/mann/gv_ruby.n* -%endif - -#-- graphviz-tcl rpm ---------------------------------------------- -%if %{TCL} -%package tcl -Group: Applications/Multimedia -Summary: Tcl extension & tools for graphviz -Requires: graphviz = %{version}-%{release} tcl >= 8.3 tk - -%description tcl -Various tcl packages (extensions) for the graphviz tools. - -%files tcl -%defattr(-,root,root,-) -%dir %{_libdir}/graphviz/tcl -%{_libdir}/graphviz/tcl/* -%{_libdir}/tcl*/* -%{_datadir}/graphviz/demo/ -# hack to include gv_tcl.n only if available -# always includes tcldot.n, gdtclft.n -%{_mandir}/mann/*tcl*.n* -%{_mandir}/mann/tkspline.n* -%endif - -#-- graphviz-devel rpm -------------------------------------------- -%package devel -Group: Development/Libraries -Summary: Development package for graphviz -Requires: graphviz = %{version}-%{release} pkgconfig - -%description devel -A collection of tools for the manipulation and layout -of graphs (as in nodes and edges, not as in barcharts). -This package contains development files for graphviz. - %files devel %defattr(-,root,root,-) %{_includedir}/graphviz %{_libdir}/*.so +%{_libdir}/graphviz/*.so %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/*.3* -%exclude %{_libdir}/graphviz/*/* -%exclude %{_libdir}/graphviz/libgvplugin* -%exclude %{_libdir}/graphviz/*.so -#-- graphviz-graphs rpm ------------------------------------------- -%package graphs -Group: Applications/Multimedia -Summary: Demo graphs for graphviz +%files devil +%defattr(-,root,root,-) +%{_libdir}/graphviz/libgvplugin_devil.so.* -%description graphs -Some demo graphs for graphviz. +%files doc +%defattr(-,root,root,-) +%doc __doc/* + +%files gd +%defattr(-,root,root,-) +%{_libdir}/graphviz/libgvplugin_gd.so.* %files graphs %defattr(-,root,root,-) %dir %{_datadir}/graphviz %{_datadir}/graphviz/graphs -#-- graphviz-doc rpm ---------------------------------------------- -%package doc -Group: Documentation -Summary: PDF and HTML documents for graphviz - -%description doc -Provides some additional PDF and HTML documentation for graphviz. - -%files doc +%files guile %defattr(-,root,root,-) -%doc __doc/* +%{_libdir}/graphviz/guile/ +%{_mandir}/mann/gv_guile.n* -#-- building -------------------------------------------------- +%files java +%defattr(-,root,root,-) +%{_libdir}/graphviz/java/ +%{_mandir}/mann/gv_java.n* -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%files lua +%defattr(-,root,root,-) +%{_libdir}/graphviz/lua/ +%{_libdir}/lua*/* +%{_mandir}/mann/gv_lua.n* -%build -%if ! %{SHARP} -%define NO_SHARP --disable-sharp -%endif -%if ! %{GUILE} -%define NO_GUILE --disable-guile -%endif -%if ! %{_IO} -%define NO_IO --disable-io -%endif -%if ! %{JAVA} -%define NO_JAVA --disable-java -%endif -%if ! %{LUA} -%define NO_LUA --disable-lua -%endif -%if ! %{OCAML} -%define NO_OCAML --disable-ocaml -%endif -%if ! %{PERL} -%define NO_PERL --disable-perl -%endif -%if ! %{PHP} -%define NO_PHP --disable-php -%endif -%if ! %{PYTHON} -%define NO_PYTHON --disable-python -%endif -%if ! %{R_LANG} -%define NO_R_LANG --disable-r -%endif -%if ! %{RUBY} -%define NO_RUBY --disable-ruby -%endif -%if ! %{TCL} -%define NO_TCL --disable-tcl -%endif -%if ! %{DEVIL} -%define NO_DEVIL --without-devil -%endif -%if ! %{MING} -%define NO_MING --without-ming +%if %{MING} +%files ming +%defattr(-,root,root,-) +%{_libdir}/graphviz/libgvplugin_ming.so.* +%{_libdir}/graphviz/*fdb %endif -# XXX ix86 only used to have -ffast-math, let's use everywhere -%{expand: %%define optflags %{optflags} -ffast-math} +%if %{OCAML} +%files ocaml +%defattr(-,root,root,-) +%{_libdir}/graphviz/ocaml/ +%{_mandir}/mann/gv_ocaml.n* +%endif -# %%configure is broken in RH7.3 rpmbuild -CFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --includedir=%{_includedir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ - --with-x \ - --disable-static \ - --disable-dependency-tracking \ - %{MYLIBGD} %{IPSEPCOLA} %{PANGOCAIRO} %{GDK_PIXBUF} \ - %{?NO_SHARP} %{?NO_GUILE} %{?NO_IO} %{?NO_JAVA} %{?NO_LUA} %{?NO_OCAML} %{?NO_PERL} %{?NO_PHP} %{?NO_PYTHON} %{?NO_R_LANG} %{?NO_RUBY} %{?NO_TCL} %{?NO_DEVIL} %{?NO_MING} -make %{?_smp_mflags} +%files perl +%defattr(-,root,root,-) +%{_libdir}/graphviz/perl/ +%{_libdir}/perl*/* +%{_mandir}/mann/gv_perl.n* -%install -rm -rf %{buildroot} __doc -make DESTDIR=%{buildroot} \ - docdir=%{buildroot}%{_docdir}/%{name} \ - pkgconfigdir=%{_libdir}/pkgconfig \ - install -find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' -chmod -x %{buildroot}%{_datadir}/%{name}/lefty/* -cp -a %{buildroot}%{_datadir}/%{name}/doc __doc -rm -rf %{buildroot}%{_datadir}/%{name}/doc +%files php +%defattr(-,root,root,-) +%{_libdir}/graphviz/php/ +%{_libdir}/php*/* +%{_datadir}/php*/* +%{_mandir}/mann/gv_php.n* -%clean -# regression test -cd rtest -make rtest -# clean up temporary installation -rm -rf %{buildroot} +%files python +%defattr(-,root,root,-) +%{_libdir}/graphviz/python/ +%{_libdir}/python*/* +%{_mandir}/mann/gv_python.n* + +%files R +%defattr(-,root,root,-) +%{_libdir}/graphviz/R/ +%{_mandir}/mann/gv_R.n* + +%files ruby +%defattr(-,root,root,-) +%{_libdir}/graphviz/ruby/ +%{_libdir}/*ruby*/* +%{_mandir}/mann/gv_ruby.n* + +%if %{SHARP} +%files sharp +%defattr(-,root,root,-) +%{_libdir}/graphviz/sharp/ +%{_mandir}/mann/gv_sharp.n* +%endif + +%files tcl +%defattr(-,root,root,-) +%{_libdir}/graphviz/tcl/ +%{_libdir}/tcl*/* +%{_datadir}/graphviz/demo/ +# hack to include gv_tcl.n only if available +# always includes tcldot.n, gdtclft.n +%{_mandir}/mann/*tcl*.n* +%{_mandir}/mann/tkspline.n* -#-- changelog -------------------------------------------------- %changelog +* Mon Mar 2 2009 Tom "spot" Callaway 2.20.3-3 +- this spec makes baby animals cry... massively clean it up +- hack in java includes to build against openjdk +- add ruby as a BuildRequires (configure checks for /usr/bin/ruby) + * Wed Feb 25 2009 John Ellson 2.20.3-2.2 - fixes for swig changes From 4efcf3b846f956b9d4203bb34697315fff9c7d36 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Jul 2009 15:54:45 +0000 Subject: [PATCH 22/31] PHP 5.3.0 build + spec cleanup --- graphviz.spec | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index cdda15d..08f9842 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,7 +1,10 @@ +%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) +%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) + Name: graphviz Summary: Graph Visualization Tools Version: 2.20.3 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -139,7 +142,13 @@ Perl extension for graphviz. %package php Group: Applications/Multimedia Summary: PHP extension for graphviz -Requires: %{name} = %{version}-%{release}, php +Requires: %{name} = %{version}-%{release} +%if %{?php_zend_api}0 +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +%else +Requires: php-api = %{php_apiver} +%endif %description php PHP extension for graphviz. @@ -223,11 +232,18 @@ chmod -x %{buildroot}%{_datadir}/%{name}/lefty/* cp -a %{buildroot}%{_datadir}/%{name}/doc __doc rm -rf %{buildroot}%{_datadir}/%{name}/doc +# PHP configuration file +%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d +%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini +; Enable %{name} extension module +extension=gv.so +__EOF__ + %check %ifnarch ppc64 ppc # regression test, segfaults on ppc/ppc64, possible endian issues? cd rtest -make rtest +LANG=C make rtest %endif %clean @@ -350,8 +366,9 @@ fi %files php %defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini %{_libdir}/graphviz/php/ -%{_libdir}/php*/* +%{php_extdir}/gv.so %{_datadir}/php*/* %{_mandir}/mann/gv_php.n* @@ -391,6 +408,12 @@ fi %changelog +* Mon Jul 13 2009 Remi Collet 2.20.3-4 +- rebuild for new PHP 5.3.0 ABI (20090626) +- add PHP ABI check +- use php_extdir (and don't own it) +- add php configuration file (/etc/php.d/graphviz.ini) + * Mon Mar 2 2009 Tom "spot" Callaway 2.20.3-3 - this spec makes baby animals cry... massively clean it up - hack in java includes to build against openjdk From a121db5f56e3da08942297b57bac92a099715096 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Jul 2009 16:36:55 +0000 Subject: [PATCH 23/31] fix previous --- graphviz.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 08f9842..4161a33 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -4,7 +4,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.20.3 -Release: 4%{?dist} +Release: 4%{?dist}.1 Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -243,7 +243,7 @@ __EOF__ %ifnarch ppc64 ppc # regression test, segfaults on ppc/ppc64, possible endian issues? cd rtest -LANG=C make rtest +make rtest %endif %clean @@ -408,6 +408,9 @@ fi %changelog +* Mon Jul 13 2009 Remi Collet 2.20.3-4.1 +- fix mistake in make rtest fix + * Mon Jul 13 2009 Remi Collet 2.20.3-4 - rebuild for new PHP 5.3.0 ABI (20090626) - add PHP ABI check From 78d30ea817099182dddb5355da5b88483b5d5b74 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 01:24:35 +0000 Subject: [PATCH 24/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- graphviz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index 4161a33..ca885a1 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -4,7 +4,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.20.3 -Release: 4%{?dist}.1 +Release: 5%{?dist}.1 Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -408,6 +408,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.20.3-5.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jul 13 2009 Remi Collet 2.20.3-4.1 - fix mistake in make rtest fix From eb63492fe14a3b9473d304ee6eedddc1df21a9ea Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:46 +0000 Subject: [PATCH 25/31] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1aa94f1..a0e5bb2 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: graphviz -# $Id: Makefile,v 1.1 2004/11/08 04:30:23 cvsextras Exp $ +# $Id: Makefile,v 1.2 2004/11/24 04:11:05 gafton Exp $ NAME := graphviz SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6ae838353cc51da1ca20b32f394a1cdebf6e5fe0 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Fri, 18 Dec 2009 20:18:11 +0000 Subject: [PATCH 26/31] newer upstream version, various bugfixes --- .cvsignore | 2 +- graphviz-sparc64.patch | 11 +++++++++ graphviz.spec | 53 +++++++++++++++++++++++------------------- sources | 2 +- 4 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 graphviz-sparc64.patch diff --git a/.cvsignore b/.cvsignore index bdfbb5a..1506006 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -graphviz-2.20.3.tar.gz +graphviz-2.26.0.tar.gz diff --git a/graphviz-sparc64.patch b/graphviz-sparc64.patch new file mode 100644 index 0000000..248bdbb --- /dev/null +++ b/graphviz-sparc64.patch @@ -0,0 +1,11 @@ +--- graphviz-2.26.0/configure.sparc64 2009-12-10 17:30:43.000000000 -0600 ++++ graphviz-2.26.0/configure 2009-12-18 11:31:30.000000000 -0600 +@@ -2834,7 +2834,7 @@ + case "${host_os}" in + *linux* ) + case "${host_cpu}" in +- powerpc64 | s390x | x86_64 ) ++ powerpc64 | s390x | x86_64 | sparc64 ) + LIBPOSTFIX="64" + ;; + esac diff --git a/graphviz.spec b/graphviz.spec index ca885a1..5d4dfbf 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -3,14 +3,13 @@ Name: graphviz Summary: Graph Visualization Tools -Version: 2.20.3 -Release: 5%{?dist}.1 +Version: 2.26.0 +Release: 1%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz -Patch0: graphviz-2.20.3-configure-php.patch -Patch1: graphviz-2.20.3-gv.i.patch +Patch0: graphviz-sparc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: /bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig @@ -18,7 +17,7 @@ BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-de BuildRequires: libXaw-devel, libSM-devel, libXext-devel, java-devel, php-devel BuildRequires: cairo-devel >= 1.1.10, pango-devel, gmp-devel, lua-devel, gtk2-devel, libgnomeui-devel BuildRequires: gd-devel, perl-devel, DevIL-devel, R-devel, swig >= 1.3.33 -%ifnarch ppc64 s390 s390x sparc64 +%ifnarch ppc64 s390 s390x sparc64 %{arm} BuildRequires: mono-core, ocaml %endif Requires: urw-fonts @@ -26,7 +25,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig # Necessary conditionals -%ifarch ppc64 s390 s390x sparc64 +%ifarch ppc64 s390 s390x sparc64 %{arm} %global SHARP 0 %global OCAML 0 %else @@ -198,7 +197,6 @@ Various tcl packages (extensions) for the graphviz tools. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build # %%define NO_IO --disable-io @@ -240,8 +238,8 @@ extension=gv.so __EOF__ %check -%ifnarch ppc64 ppc -# regression test, segfaults on ppc/ppc64, possible endian issues? +%ifnarch ppc64 ppc sparc64 +# regression test, segfaults on ppc/ppc64/sparc64, possible endian issues? cd rtest make rtest %endif @@ -309,7 +307,7 @@ fi %{_libdir}/*.so %{_libdir}/graphviz/*.so %{_libdir}/pkgconfig/*.pc -%{_mandir}/man3/*.3* +%{_mandir}/man3/*.3.gz %files devil %defattr(-,root,root,-) @@ -331,18 +329,18 @@ fi %files guile %defattr(-,root,root,-) %{_libdir}/graphviz/guile/ -%{_mandir}/mann/gv_guile.n* +%{_mandir}/man3/gv.3guile* %files java %defattr(-,root,root,-) %{_libdir}/graphviz/java/ -%{_mandir}/mann/gv_java.n* +%{_mandir}/man3/gv.3java* %files lua %defattr(-,root,root,-) %{_libdir}/graphviz/lua/ %{_libdir}/lua*/* -%{_mandir}/mann/gv_lua.n* +%{_mandir}/man3/gv.3lua* %if %{MING} %files ming @@ -355,14 +353,14 @@ fi %files ocaml %defattr(-,root,root,-) %{_libdir}/graphviz/ocaml/ -%{_mandir}/mann/gv_ocaml.n* +%{_mandir}/man3/gv.3ocaml* %endif %files perl %defattr(-,root,root,-) %{_libdir}/graphviz/perl/ %{_libdir}/perl*/* -%{_mandir}/mann/gv_perl.n* +%{_mandir}/man3/gv.3perl* %files php %defattr(-,root,root,-) @@ -370,30 +368,30 @@ fi %{_libdir}/graphviz/php/ %{php_extdir}/gv.so %{_datadir}/php*/* -%{_mandir}/mann/gv_php.n* +%{_mandir}/man3/gv.3php* %files python %defattr(-,root,root,-) %{_libdir}/graphviz/python/ %{_libdir}/python*/* -%{_mandir}/mann/gv_python.n* +%{_mandir}/man3/gv.3python* %files R %defattr(-,root,root,-) %{_libdir}/graphviz/R/ -%{_mandir}/mann/gv_R.n* +%{_mandir}/man3/gv.3r.gz %files ruby %defattr(-,root,root,-) %{_libdir}/graphviz/ruby/ %{_libdir}/*ruby*/* -%{_mandir}/mann/gv_ruby.n* +%{_mandir}/man3/gv.3ruby* %if %{SHARP} %files sharp %defattr(-,root,root,-) %{_libdir}/graphviz/sharp/ -%{_mandir}/mann/gv_sharp.n* +%{_mandir}/man3/gv.3sharp* %endif %files tcl @@ -401,13 +399,20 @@ fi %{_libdir}/graphviz/tcl/ %{_libdir}/tcl*/* %{_datadir}/graphviz/demo/ -# hack to include gv_tcl.n only if available -# always includes tcldot.n, gdtclft.n -%{_mandir}/mann/*tcl*.n* -%{_mandir}/mann/tkspline.n* +# hack to include gv.3tcl only if available +# always includes tcldot.3tcl, gdtclft.3tcl +%{_mandir}/man3/*.3tcl* +%{_mandir}/man3/tkspline.3tk* %changelog +* Fri Dec 18 2009 Patrick "Jima" Laughton 2.26.0-1 +- Updated to latest release +- Removed patches that have been applied upstream +- Fixed man page paths (mann -> man3) +- Disabled mono and ocaml for ARM (Jitesh Shah, BZ#532047) +- Disabled regression tests on sparc64 as well as ppc/ppc64 (Dennis Gilmore) + * Fri Jul 24 2009 Fedora Release Engineering - 2.20.3-5.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 2edf615..08a0e50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d94c4b809a5c095acfc973d8d207fa9 graphviz-2.20.3.tar.gz +0609b42cb9ef913b7af13e43c4d716c9 graphviz-2.26.0.tar.gz From 4d36c863d2530d61db4f681acb3ea2d5d1a94466 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Mon, 4 Jan 2010 14:56:04 +0000 Subject: [PATCH 27/31] bump-n-build for new ocaml --- graphviz.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index 5d4dfbf..0319ce7 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -4,7 +4,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -406,6 +406,10 @@ fi %changelog +* Mon Jan 04 2010 Patrick "Jima" Laughton 2.26.0-2 +- Rebuild for updated ocaml +- Happy new year, Fedora! + * Fri Dec 18 2009 Patrick "Jima" Laughton 2.26.0-1 - Updated to latest release - Removed patches that have been applied upstream From 6cf29f481c1ab139feb97e48f4096606590e214f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 1 Jun 2010 16:22:40 +0000 Subject: [PATCH 28/31] - Mass rebuild with perl-5.12.0 --- graphviz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index 0319ce7..a09126f 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -4,7 +4,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.26.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -406,6 +406,9 @@ fi %changelog +* Tue Jun 01 2010 Marcela Maslanova - 2.26.0-3 +- Mass rebuild with perl-5.12.0 + * Mon Jan 04 2010 Patrick "Jima" Laughton 2.26.0-2 - Rebuild for updated ocaml - Happy new year, Fedora! From 0216915b486b7c5315ceb45eda175a2e0f58468d Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 01:45:59 +0000 Subject: [PATCH 29/31] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- graphviz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphviz.spec b/graphviz.spec index a09126f..7c36514 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -4,7 +4,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.26.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -406,6 +406,9 @@ fi %changelog +* Wed Jul 21 2010 David Malcolm - 2.26.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Tue Jun 01 2010 Marcela Maslanova - 2.26.0-3 - Mass rebuild with perl-5.12.0 From 8db864f181cccb9da2e09104ea58f554c90284bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 17:01:47 +0000 Subject: [PATCH 30/31] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0e5bb2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: graphviz -# $Id: Makefile,v 1.2 2004/11/24 04:11:05 gafton Exp $ -NAME := graphviz -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 36b7ab18a31385cbc5fa655e3bdad469a9aa2d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 7 Jan 2011 00:04:57 +0100 Subject: [PATCH 31/31] - New version (#580017) - Fixed gtk plugin program-name (#640671, gtk-progname patch) - Fixed broken links in doc index (#642536, doc-index-fix patch) - Fixed SIGSEGVs on testsuite (#645703, testsuite-sigsegv-fix patch) - Testsuite now do diff check also in case of err output (#645703, rtest-errout-fix patch) - Testsuite enabled on all arches (#645703) - Added urw-fonts to BuildRequires - Compiled with -fno-strict-aliasing - Fixed rpmlint warnings on spec file - Removed unused patches --- .gitignore | 1 + graphviz-2.20.3-configure-php.patch | 13 -- graphviz-2.20.3-gv.i.patch | 45 ----- graphviz-2.26.0-doc-index-fix.patch | 85 +++++++++ graphviz-2.26.0-gtk-progname.patch | 11 ++ graphviz-2.26.0-rtest-errout-fix.patch | 22 +++ graphviz-2.26.0-testsuite-sigsegv-fix.patch | 26 +++ graphviz-arith.patch | 29 ---- graphviz-black.patch | 29 ---- graphviz-gcc43.patch | 32 ---- graphviz-libcdt.patch | 11 -- graphviz-multilib.patch | 14 -- graphviz-php5.patch | 30 ---- graphviz-tk8.5.patch | 181 -------------------- graphviz.spec | 57 ++++-- sources | 2 +- 16 files changed, 186 insertions(+), 402 deletions(-) delete mode 100644 graphviz-2.20.3-configure-php.patch delete mode 100644 graphviz-2.20.3-gv.i.patch create mode 100644 graphviz-2.26.0-doc-index-fix.patch create mode 100644 graphviz-2.26.0-gtk-progname.patch create mode 100644 graphviz-2.26.0-rtest-errout-fix.patch create mode 100644 graphviz-2.26.0-testsuite-sigsegv-fix.patch delete mode 100644 graphviz-arith.patch delete mode 100644 graphviz-black.patch delete mode 100644 graphviz-gcc43.patch delete mode 100644 graphviz-libcdt.patch delete mode 100644 graphviz-multilib.patch delete mode 100644 graphviz-php5.patch delete mode 100644 graphviz-tk8.5.patch diff --git a/.gitignore b/.gitignore index 1506006..0731299 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ graphviz-2.26.0.tar.gz +/graphviz-2.26.3.tar.gz diff --git a/graphviz-2.20.3-configure-php.patch b/graphviz-2.20.3-configure-php.patch deleted file mode 100644 index a2e19b5..0000000 --- a/graphviz-2.20.3-configure-php.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- graphviz-2.20.3/configure.orig 2009-02-25 13:14:22.000000000 -0500 -+++ graphviz-2.20.3/configure 2009-02-25 13:15:02.000000000 -0500 -@@ -27376,8 +27376,8 @@ - if test "x$use_swig" != "xYes"; then - use_php="No (swig not available)" - else -- if test `$SWIG -help 2>&1 | $GREP -c '\-php5 *- Generate'` = 0; then -- use_php="No (swig does not support -php5 option)" -+ if test `$SWIG -help 2>&1 | $GREP -c '\-php5* *- Generate'` = 0; then -+ use_php="No (swig does not support -php or -php5 option)" - else - # Extract the first word of "php", so it can be a program name with args. - set dummy php; ac_word=$2 diff --git a/graphviz-2.20.3-gv.i.patch b/graphviz-2.20.3-gv.i.patch deleted file mode 100644 index 8f878f9..0000000 --- a/graphviz-2.20.3-gv.i.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- graphviz-2.20.3/tclpkg/gv/gv.i.orig 2009-02-25 13:44:36.000000000 -0500 -+++ graphviz-2.20.3/tclpkg/gv/gv.i 2009-02-25 13:46:29.000000000 -0500 -@@ -15,8 +15,22 @@ - **********************************************************/ - - %module gv --%{ - -+#ifdef SWIGTCL -+// A typemap telling SWIG to ignore an argument for input -+// However, we still need to pass a pointer to the C function -+%typemap(in,numinputs=0) char *outdata (char *temp) { -+ $1 = &temp; -+} -+// A typemap defining how to return an argument by appending it to the result -+%typemap(argout) char *outdata { -+ Tcl_Obj *o = Tcl_NewStringObj($1); -+ Tcl_ListObjAppendElement(interp,$result,o); -+} -+#endif -+ -+ -+%{ - /* some language headers (e.g. php.h, ruby.h) leave these defined */ - #undef PACKAGE_BUGREPORT - #undef PACKAGE_STRING -@@ -371,18 +385,4 @@ - extern bool write(Agraph_t *g, char *filename); - extern bool write(Agraph_t *g, FILE *f); - -- --#ifdef SWIGTCL --// A typemap telling SWIG to ignore an argument for input --// However, we still need to pass a pointer to the C function --%typemap(in,numinputs=0) char *outdata (char *temp) { -- $1 = &temp; --} --// A typemap defining how to return an argument by appending it to the result --%typemap(argout) char *outdata { -- Tcl_Obj *o = Tcl_NewStringObj($1); -- Tcl_ListObjAppendElement(interp,$result,o); --} --#endif -- - %} diff --git a/graphviz-2.26.0-doc-index-fix.patch b/graphviz-2.26.0-doc-index-fix.patch new file mode 100644 index 0000000..ec36c46 --- /dev/null +++ b/graphviz-2.26.0-doc-index-fix.patch @@ -0,0 +1,85 @@ +--- graphviz-2.26.0/doc/index.html.old 2008-08-25 19:09:29.000000000 +0200 ++++ graphviz-2.26.0/doc/index.html 2010-10-13 14:52:56.000000000 +0200 +@@ -13,7 +13,6 @@ + +
  • Guides (PDF) +@@ -26,45 +25,41 @@ + +
  • Command manual pages (PDF) + +
  • Tcl package manual pages (PDF) + +
  • Library manual pages (PDF) + + + diff --git a/graphviz-2.26.0-gtk-progname.patch b/graphviz-2.26.0-gtk-progname.patch new file mode 100644 index 0000000..795c233 --- /dev/null +++ b/graphviz-2.26.0-gtk-progname.patch @@ -0,0 +1,11 @@ +--- graphviz-2.26.0/plugin/gtk/callbacks.c.old 2009-06-03 03:10:57.000000000 +0200 ++++ graphviz-2.26.0/plugin/gtk/callbacks.c 2010-10-06 17:38:59.703008542 +0200 +@@ -187,7 +187,7 @@ + NULL }; + GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(menuitem))); + gtk_show_about_dialog(window, +- "name", "DotEdit", ++ "program-name", "DotEdit", + "version", "0.1", + "copyright", "(C) 2005 AT&T Corp.", + "license", "Common Public License, Version 1.0.", diff --git a/graphviz-2.26.0-rtest-errout-fix.patch b/graphviz-2.26.0-rtest-errout-fix.patch new file mode 100644 index 0000000..83f0cb2 --- /dev/null +++ b/graphviz-2.26.0-rtest-errout-fix.patch @@ -0,0 +1,22 @@ +--- graphviz-2.26.0/rtest/rtest.sh.old 2009-12-06 00:27:49.000000000 +0100 ++++ graphviz-2.26.0/rtest/rtest.sh 2010-10-22 10:37:42.952893435 +0200 +@@ -279,14 +279,16 @@ + $testcmd 2> errout + RVAL=$? + ++ if [[ -s errout ]] ++ then ++ cat errout ++ fi ++ + if [[ $RVAL != 0 || ! -s $OUTPATH ]] + then + (( CRASH_CNT+=1 )) + print -u 2 "Test $TESTNAME:$i : == Layout failed ==" + print -u 2 " $testcmd" +- elif [[ -s errout ]] +- then +- cat errout + elif [[ $GENERATE == 1 ]] + then + continue diff --git a/graphviz-2.26.0-testsuite-sigsegv-fix.patch b/graphviz-2.26.0-testsuite-sigsegv-fix.patch new file mode 100644 index 0000000..d278bc1 --- /dev/null +++ b/graphviz-2.26.0-testsuite-sigsegv-fix.patch @@ -0,0 +1,26 @@ +--- graphviz-2.26.0/lib/gvc/gvconfig.c.old 2009-07-08 17:14:20.000000000 +0200 ++++ graphviz-2.26.0/lib/gvc/gvconfig.c 2010-10-20 11:51:21.238392202 +0200 +@@ -471,6 +471,7 @@ + libdir = gvconfig_libdir(gvc); + rc = stat(libdir, &libdir_st); + if (rc == -1) { ++ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */ + /* if we fail to stat it then it probably doesn't exist so just fail silently */ + return; + } +@@ -485,6 +486,7 @@ + if (rescan) { + config_rescan(gvc, gvc->config_path); + gvc->config_found = TRUE; ++ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */ + return; + } + +@@ -492,6 +494,7 @@ + + rc = stat(gvc->config_path, &config_st); + if (rc == -1) { ++ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */ + /* silently return without setting gvc->config_found = TRUE */ + return; + } diff --git a/graphviz-arith.patch b/graphviz-arith.patch deleted file mode 100644 index 126efeb..0000000 --- a/graphviz-arith.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: lib/common/Makefile.am -=================================================================== -RCS file: /home/cvsroot/graphviz2/lib/common/Makefile.am,v -retrieving revision 1.46 -retrieving revision 1.47 -diff -u -r1.46 -r1.47 ---- lib/common/Makefile.am 26 Jul 2007 13:53:25 -0000 1.46 -+++ lib/common/Makefile.am 4 Sep 2007 23:39:07 -0000 1.47 -@@ -1,4 +1,4 @@ --# $Id: Makefile.am,v 1.46 2007/07/26 13:53:25 erg Exp $ $Revision: 1.46 $ -+# $Id: Makefile.am,v 1.47 2007/09/04 23:39:07 ellson Exp $ $Revision: 1.47 $ - ## Process this file with automake to produce Makefile.in - - AM_CPPFLAGS = \ -@@ -14,11 +14,10 @@ - AM_CFLAGS = -D_BLD_common=1 - endif - --pkginclude_HEADERS = geom.h color.h types.h textpara.h usershape.h -+pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h - noinst_HEADERS = render.h utils.h memory.h \ -- geomprocs.h colorprocs.h colortbl.h entities.h \ -- logic.h arith.h globals.h \ -- const.h macros.h htmllex.h htmltable.h pointset.h -+ geomprocs.h colorprocs.h colortbl.h entities.h globals.h \ -+ logic.h const.h macros.h htmllex.h htmltable.h pointset.h - noinst_LTLIBRARIES = libcommon_C.la - - if WITH_CODEGENS diff --git a/graphviz-black.patch b/graphviz-black.patch deleted file mode 100644 index 18cfa48..0000000 --- a/graphviz-black.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- graphviz-2.12/lib/common/colxlate.c.orig 2006-07-26 22:44:05.000000000 -0500 -+++ graphviz-2.12/lib/common/colxlate.c 2007-07-12 14:07:13.000000000 -0500 -@@ -1,4 +1,4 @@ --/* $Id: colxlate.c,v 1.11 2006/07/27 03:44:05 erg Exp $ $Revision: 1.11 $ */ -+/* $Id: colxlate.c,v 1.13 2007/07/12 16:47:57 erg Exp $ $Revision: 1.13 $ */ - /* vim:set shiftwidth=4 ts=8: */ - - /********************************************************** -@@ -180,6 +180,10 @@ - - /* resolveColor: - * Resolve input color str allowing color scheme namespaces. -+ * 0) "black" => "black" -+ * NB: This is something of a hack due to the remaining codegen. -+ * Once these are gone, this case could be removed and all references -+ * to "black" could be replaced by "/X11/black". - * 1) No initial / => - * if colorscheme is defined and no "X11", return /colorscheme/str - * else return str -@@ -214,7 +218,8 @@ - char* ss; /* second slash */ - char* c2; /* second char */ - -- if (*str == '/') { /* if begins with '/' */ -+ if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str; -+ else if (*str == '/') { /* if begins with '/' */ - c2 = str+1; - if ((ss = strchr(c2, '/'))) { /* if has second '/' */ - if (*c2 == '/') { /* if second '/' is second character */ diff --git a/graphviz-gcc43.patch b/graphviz-gcc43.patch deleted file mode 100644 index 180b703..0000000 --- a/graphviz-gcc43.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- graphviz-2.16/lib/vpsc/generate-constraints.cpp.orig 2008-02-11 13:42:16.000000000 -0500 -+++ graphviz-2.16/lib/vpsc/generate-constraints.cpp 2008-02-11 13:05:19.000000000 -0500 -@@ -18,6 +18,7 @@ - - #include - #include -+#include - #include "generate-constraints.h" - #include "constraint.h" - ---- graphviz-2.16/lib/vpsc/csolve_VPSC.cpp.orig 2008-02-11 13:42:00.000000000 -0500 -+++ graphviz-2.16/lib/vpsc/csolve_VPSC.cpp 2008-02-11 13:05:19.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include "csolve_VPSC.h" - extern "C" { ---- graphviz-2.16/tclpkg/gv/gv.i.orig 2008-02-11 13:41:21.000000000 -0500 -+++ graphviz-2.16/tclpkg/gv/gv.i 2008-02-11 13:38:57.000000000 -0500 -@@ -25,6 +25,9 @@ - #undef TRUE - #undef FALSE - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - #include "gvc.h" - %} - diff --git a/graphviz-libcdt.patch b/graphviz-libcdt.patch deleted file mode 100644 index d3cad46..0000000 --- a/graphviz-libcdt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- graphviz-2.12/lib/expr/Makefile.am.orig 2006-09-26 11:47:54.000000000 -0500 -+++ graphviz-2.12/lib/expr/Makefile.am 2007-05-05 11:49:49.000000000 -0500 -@@ -34,7 +34,7 @@ - - libexpr_la_LDFLAGS = -version-info @VERSION_INFO@ - libexpr_la_SOURCES = $(libexpr_C_la_SOURCES) --libexpr_la_LIBADD = $(libexpr_C_la_LIBADD) -+libexpr_la_LIBADD = $(libexpr_C_la_LIBADD) \ - $(top_builddir)/lib/cdt/libcdt.la - - $(libexpr_la_OBJECTS): exparse.h exparse.c exgram.h exop.h diff --git a/graphviz-multilib.patch b/graphviz-multilib.patch deleted file mode 100644 index 898b0cf..0000000 --- a/graphviz-multilib.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c ---- graphviz-2.16.1.orig/plugin/pango/gvtextlayout_pango.c 2007-11-09 17:31:43.000000000 -0600 -+++ graphviz-2.16.1/plugin/pango/gvtextlayout_pango.c 2008-03-03 09:55:01.000000000 -0600 -@@ -154,8 +154,8 @@ - logical_rect.height = 0; - - textlayout_scale = POINTS_PER_INCH / (FONT_DPI * PANGO_SCALE); -- para->width = logical_rect.width * textlayout_scale; -- para->height = logical_rect.height * textlayout_scale; -+ para->width = ROUND(logical_rect.width * textlayout_scale); -+ para->height = ROUND(logical_rect.height * textlayout_scale); - - /* The y offset from baseline to 0,0 of the bitmap representation */ - iter = pango_layout_get_iter (layout); diff --git a/graphviz-php5.patch b/graphviz-php5.patch deleted file mode 100644 index e5587ba..0000000 --- a/graphviz-php5.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure ---- graphviz-2.12/configure 2006-12-04 16:02:10.000000000 -0600 -+++ graphviz-2.12-patched/configure 2006-12-08 09:45:19.000000000 -0600 -@@ -25552,7 +25552,7 @@ - - fi; - if test "x$enable_php" != "xno"; then --if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then -+if test `$SWIG -help 2>&1 | $GREP -c '\-php[5 ]*- Generate'` = 0; then - PHP= - { echo "$as_me:$LINENO: WARNING: swig does not support php. The PHP packages will not be built" >&5 - echo "$as_me: WARNING: swig does not support php. The PHP packages will not be built" >&2;} -diff -urN graphviz-2.12/configure.ac graphviz-2.12-patched/configure.ac ---- graphviz-2.12/configure.ac 2006-12-04 15:11:58.000000000 -0600 -+++ graphviz-2.12-patched/configure.ac 2006-12-08 08:07:10.000000000 -0600 -@@ -1,4 +1,4 @@ --# $Id: graphviz-php5.patch,v 1.1 2006/12/11 18:42:36 jima Exp $ $Revision: 1.1 $ -+# $Id: graphviz-php5.patch,v 1.1 2006/12/11 18:42:36 jima Exp $ $Revision: 1.1 $ - - # Process this file with autoconf to produce a configure script - AC_PREREQ(2.54) -@@ -628,7 +628,7 @@ - AC_ARG_ENABLE(php, - [AC_HELP_STRING([--disable-php], [don't support php language bindings])]) - if test "x$enable_php" != "xno"; then --if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then -+if test `$SWIG -help 2>&1 | $GREP -c '\-php[[5 ]]*- Generate'` = 0; then - PHP= - AC_MSG_WARN([swig does not support php. The PHP packages will not be built]) - else diff --git a/graphviz-tk8.5.patch b/graphviz-tk8.5.patch deleted file mode 100644 index c204047..0000000 --- a/graphviz-tk8.5.patch +++ /dev/null @@ -1,181 +0,0 @@ -diff -urN graphviz-2.16.orig/configure graphviz-2.16/configure ---- graphviz-2.16.orig/configure 2007-11-09 23:41:41.000000000 -0600 -+++ graphviz-2.16/configure 2008-01-03 08:52:00.000000000 -0600 -@@ -28003,8 +28003,8 @@ - - - if test "x$TCLSH" = "x"; then -- # Extract the first word of "tclsh8.4", so it can be a program name with args. --set dummy tclsh8.4; ac_word=$2 -+ # Extract the first word of "tclsh8.5", so it can be a program name with args. -+set dummy tclsh8.5; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_TCLSH+set}" = set; then -@@ -28044,8 +28044,8 @@ - - - if test "x$TCLSH" = "x"; then -- # Extract the first word of "tclsh8.3", so it can be a program name with args. --set dummy tclsh8.3; ac_word=$2 -+ # Extract the first word of "tclsh8.4", so it can be a program name with args. -+set dummy tclsh8.4; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_TCLSH+set}" = set; then -@@ -28085,7 +28085,48 @@ - - - if test "x$TCLSH" = "x"; then -- # Extract the first word of "tclsh", so it can be a program name with args. -+ # Extract the first word of "tclsh8.3", so it can be a program name with args. -+set dummy tclsh8.3; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_TCLSH+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $TCLSH in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+TCLSH=$ac_cv_path_TCLSH -+if test -n "$TCLSH"; then -+ { echo "$as_me:$LINENO: result: $TCLSH" >&5 -+echo "${ECHO_T}$TCLSH" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ if test "x$TCLSH" = "x"; then -+ # Extract the first word of "tclsh", so it can be a program name with args. - set dummy tclsh; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -@@ -28125,6 +28166,7 @@ - fi - - -+ fi - fi - fi - if test "x$TCLSH" = "x"; then -@@ -28413,8 +28455,8 @@ - fi - - if test "x$WISH" = "x"; then -- # Extract the first word of "wish8.4", so it can be a program name with args. --set dummy wish8.4; ac_word=$2 -+ # Extract the first word of "wish8.5", so it can be a program name with args. -+set dummy wish8.5; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_WISH+set}" = set; then -@@ -28454,8 +28496,8 @@ - - - if test "x$WISH" = "x"; then -- # Extract the first word of "wish8.3", so it can be a program name with args. --set dummy wish8.3; ac_word=$2 -+ # Extract the first word of "wish8.4", so it can be a program name with args. -+set dummy wish8.4; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_WISH+set}" = set; then -@@ -28495,7 +28537,48 @@ - - - if test "x$WISH" = "x"; then -- # Extract the first word of "wish", so it can be a program name with args. -+ # Extract the first word of "wish8.3", so it can be a program name with args. -+set dummy wish8.3; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_WISH+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $WISH in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_WISH="$WISH" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+WISH=$ac_cv_path_WISH -+if test -n "$WISH"; then -+ { echo "$as_me:$LINENO: result: $WISH" >&5 -+echo "${ECHO_T}$WISH" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ if test "x$WISH" = "x"; then -+ # Extract the first word of "wish", so it can be a program name with args. - set dummy wish; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -@@ -28535,6 +28618,7 @@ - fi - - -+ fi - fi - fi - fi -@@ -28557,7 +28641,7 @@ - WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` - - if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then -- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic" -+ TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix" - else - if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then - TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include -@@ -34721,7 +34805,7 @@ - # ----------------------------------- - # tkInt.h - if test -f "$TK_SRC_DIR/generic/tkInt.h"; then --TKINT_INCLUDES="-I$TK_SRC_DIR/generic" -+TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix" - else - if test -f "/usr/include/tkInt.h"; then - TKINT_INCLUDES="" diff --git a/graphviz.spec b/graphviz.spec index 7c36514..c54e78e 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -3,13 +3,22 @@ Name: graphviz Summary: Graph Visualization Tools -Version: 2.26.0 -Release: 4%{?dist} +Version: 2.26.3 +Release: 1%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz +# Fix for sparc64. Patch0: graphviz-sparc64.patch +# Fix gtk plugin program-name (#640671). +Patch1: graphviz-2.26.0-gtk-progname.patch +# Fix broken links in doc index (#642536). +Patch2: graphviz-2.26.0-doc-index-fix.patch +# Fix SIGSEGVs on testsuite (#645703). +Patch3: graphviz-2.26.0-testsuite-sigsegv-fix.patch +# Testsuite now do diff check also in case of err output (#645703). +Patch4: graphviz-2.26.0-rtest-errout-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: /bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig @@ -20,7 +29,7 @@ BuildRequires: gd-devel, perl-devel, DevIL-devel, R-devel, swig >= 1.3.33 %ifnarch ppc64 s390 s390x sparc64 %{arm} BuildRequires: mono-core, ocaml %endif -Requires: urw-fonts +BuildRequires: urw-fonts Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -50,9 +59,9 @@ and edges, not as in barcharts). This package contains development files for graphviz. %package devil -Group: Applications/Multimedia -Summary: Graphviz plugin for renderers based on DevIL -Requires: %{name} = %{version}-%{release} +Group: Applications/Multimedia +Summary: Graphviz plugin for renderers based on DevIL +Requires: %{name} = %{version}-%{release} %description devil Graphviz plugin for renderers based on DevIL. (Unless you absolutely have @@ -196,7 +205,11 @@ Various tcl packages (extensions) for the graphviz tools. %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .sparc64 +%patch1 -p1 -b .gtk-progname +%patch2 -p1 -b .doc-index-fix +%patch3 -p1 -b .testsuite-sigsegv-fix +%patch4 -p1 -b .rtest-errout-fix %build # %%define NO_IO --disable-io @@ -217,14 +230,14 @@ sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linu --without-ming \ %endif -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install rm -rf %{buildroot} __doc make DESTDIR=%{buildroot} \ - docdir=%{buildroot}%{_docdir}/%{name} \ - pkgconfigdir=%{_libdir}/pkgconfig \ - install + docdir=%{buildroot}%{_docdir}/%{name} \ + pkgconfigdir=%{_libdir}/pkgconfig \ + install find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' chmod -x %{buildroot}%{_datadir}/%{name}/lefty/* cp -a %{buildroot}%{_datadir}/%{name}/doc __doc @@ -238,11 +251,8 @@ extension=gv.so __EOF__ %check -%ifnarch ppc64 ppc sparc64 -# regression test, segfaults on ppc/ppc64/sparc64, possible endian issues? cd rtest make rtest -%endif %clean rm -rf %{buildroot} @@ -254,11 +264,11 @@ rm -rf %{buildroot} # if there is no dot after everything else is done, then remove config %postun if [ $1 -eq 0 ]; then - rm -f %{_libdir}/graphviz/config || : + rm -f %{_libdir}/graphviz/config || : fi /sbin/ldconfig -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +# run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config %post devil %{_bindir}/dot -c @@ -274,7 +284,7 @@ fi [ -x %{_bindir}/dot ] && %{_bindir}/dot -c || : %if %{MING} -# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config +# run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config %post ming %{_bindir}/dot -c @@ -406,6 +416,19 @@ fi %changelog +* Thu Jan 06 2011 Jaroslav Škarvada - 2.26.3-1 +- New version (#580017) +- Fixed gtk plugin program-name (#640671, gtk-progname patch) +- Fixed broken links in doc index (#642536, doc-index-fix patch) +- Fixed SIGSEGVs on testsuite (#645703, testsuite-sigsegv-fix patch) +- Testsuite now do diff check also in case of err output (#645703, + rtest-errout-fix patch) +- Testsuite enabled on all arches (#645703) +- Added urw-fonts to BuildRequires +- Compiled with -fno-strict-aliasing +- Fixed rpmlint warnings on spec file +- Removed unused patches + * Wed Jul 21 2010 David Malcolm - 2.26.0-4 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index 08a0e50..efbb2d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0609b42cb9ef913b7af13e43c4d716c9 graphviz-2.26.0.tar.gz +6f45946fa622770c45609778c0a982ee graphviz-2.26.3.tar.gz