dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-graphviz-2.8.tar.gz

.gitignore

@@ -0,0 +1 @@
+graphviz-2.20.3.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: graphviz
-# $Id: Makefile,v 1.1 2004/11/08 04:30:23 cvsextras 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
-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)

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

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
+-
+ %}

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

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: graphviz-black.patch,v 1.1 2007/07/12 19:43:18 jima Exp $ $Revision: 1.1 $ */
++/* $Id: graphviz-black.patch,v 1.1 2007/07/12 19:43:18 jima Exp $ $Revision: 1.1 $ */
+ /* 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 */

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 <set>
+ #include <cassert>
++#include <cstdlib>
+ #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 <constraint.h>
+ #include <generate-constraints.h>
+ #include <solve_VPSC.h>
++#include <cstdlib>
+ #include <cassert>
+ #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"
+ %}
+ 

graphviz-libcdt.patch

@@ -0,0 +1,11 @@
+--- 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

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);

graphviz-php5.patch

@@ -0,0 +1,30 @@
+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: configure.ac,v 1.168 2006/12/04 21:11:58 erg Exp $ $Revision: 1.168 $
++# $Id: configure.ac,v 1.170 2006/12/07 17:25:53 ellson Exp $ $Revision: 1.170 $
+ 
+ # 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

graphviz-sparc64-libpostfix.patch

@@ -0,0 +1,11 @@
+--- graphviz-2.20.3/configure.bad	2010-01-27 17:23:40.000000000 +0000
++++ graphviz-2.20.3/configure	2010-01-27 17:24:43.000000000 +0000
+@@ -2595,7 +2595,7 @@
+ case "${host_os}" in
+   *linux* )
+     case "${host_cpu}" in
+-      powerpc64 | s390x | x86_64 )
++      powerpc64 | s390x | x86_64 | sparc64 )
+         LIBPOSTFIX="64"
+         ;;
+     esac

graphviz-tk8.5.patch

@@ -0,0 +1,181 @@
+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=""

graphviz.spec

@@ -1,397 +1,506 @@
-# $Id: graphviz.spec.in,v 1.68 2006/01/30 23:45:06 ellson Exp $ $Revision: 1.68 $
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-# graphviz.spec.  Generated from graphviz.spec.in by configure.
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
-# Io is disabled because it's not (yet?) found in Fedora.
+Name:			graphviz
-# http://www.iolanguage.com/about/
+Summary:		Graph Visualization Tools
-# - Jima
+Version:		2.20.3
-%define _IO 0
+Release:		5%{?dist}.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
+Patch2:                 graphviz-sparc64-libpostfix.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: graphviz requires gd with gif support (and other fixes), hence use
+# Necessary conditionals
-# internal one for now.
+%ifarch ppc64 s390 s390x sparc64
-
+%global SHARP  0
-Summary:	Graph Visualization Tools
+%global OCAML  0
-Name:		graphviz
+%else
-Version:	2.8
+%global SHARP  1
-Release:	5%{?dist}
+%global OCAML  1
-Group:		Applications/Multimedia
+%endif
-License:	CPL
+# Not in Fedora yet.
-URL:		http://www.graphviz.org/
+%global MING   0
-Source:		http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-Requires:	urw-fonts
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	libpng-devel libjpeg-devel expat-devel ksh bison flex 
-BuildRequires:	libtool-ltdl-devel fontconfig-devel swig libXaw-devel 
-BuildRequires:	libSM-devel libXpm-devel libXext-devel libXt-devel
-BuildRequires:	mono-core guile-devel libgcj-devel java-1.4.2-gcj-compat-devel
-BuildRequires:	lua-devel ocaml php-devel python-devel ruby-devel tk-devel
 
 %description
-A collection of tools for the manipulation and layout
+A collection of tools for the manipulation and layout of graphs (as in nodes 
-of graphs (as in nodes and edges, not as in barcharts).
+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}
+%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.
+
+%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
+%patch2 -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
+
+# 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 %{sparc}
+# regression test, segfaults on ppc/ppc64, possible endian issues?
+cd rtest
+make rtest
+%endif
+
+%clean
+rm -rf %{buildroot}
+
+%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
+
+# 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
 %{_bindir}/*
-%dir %{_libdir}/%{name}
+%dir %{_libdir}/graphviz
-%{_libdir}/%{name}/*.so.*
+%{_libdir}/*.so.*
+%{_libdir}/graphviz/*.so.*
 %{_mandir}/man1/*.1*
-%dir %{_datadir}/%{name}
+%{_mandir}/man7/*.7*
-%{_datadir}/%{name}/lefty
+%dir %{_datadir}/graphviz
-%exclude %{_libdir}/%{name}/*/*
+%{_datadir}/graphviz/lefty
-
+%exclude %{_libdir}/graphviz/*/*
-#------------------------------------------------------------------
+%exclude %{_libdir}/graphviz/libgvplugin_gd.*
-%package sharp
+%exclude %{_libdir}/graphviz/libgvplugin_devil.*
-Group:	Applications/Multimedia
+%if %{MING}
-Summary:	C# extension for %{name}
+%exclude %{_libdir}/graphviz/libgvplugin_ming.*
-Requires:	%{name} = %{version}-%{release}
+%exclude %{_libdir}/graphviz/*fdb
-
-%description sharp
-C# extensions for %{name}.
-
-%files sharp
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/sharp
-%{_libdir}/%{name}/sharp/*
-
-#------------------------------------------------------------------
-%package guile
-Group:		Applications/Multimedia
-Summary:	Guile extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description guile
-Guile extensions for %{name}.
-
-%files guile
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/guile
-%{_libdir}/%{name}/guile/*
-
-#------------------------------------------------------------------
-%if %{_IO}
-%package io
-Group:		Applications/Multimedia
-Summary:	Io extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description io
-Java extensions for %{name}.
-
-%files io
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/io
-%{_libdir}/%{name}/io/*
 %endif
 
-#------------------------------------------------------------------
-%package java
-Group:		Applications/Multimedia
-Summary:	Java extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description java
-Java extensions for %{name}.
-
-%files java
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/java
-%{_libdir}/%{name}/java/*
-
-#------------------------------------------------------------------
-%package lua
-Group:		Applications/Multimedia
-Summary:	Lua extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description lua
-Java extensions for %{name}.
-
-%files lua
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/lua
-%{_libdir}/%{name}/lua/*
-
-#------------------------------------------------------------------
-%package ocaml
-Group:		Applications/Multimedia
-Summary:	Ocaml extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description ocaml
-Ocaml extensions for %{name}.
-
-%files ocaml
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/ocaml
-%{_libdir}/%{name}/ocaml/*
-
-#------------------------------------------------------------------
-%package perl
-Group:		Applications/Multimedia
-Summary:	Perl extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description perl
-Perl extensions for %{name}.
-
-%files perl
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/perl
-%{_libdir}/%{name}/perl/*
-
-#------------------------------------------------------------------
-%package php
-Group:		Applications/Multimedia
-Summary:	PHP extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description php
-PHP extensions for %{name}.
-
-%files php
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/php
-%{_libdir}/%{name}/php/*
-
-#------------------------------------------------------------------
-%package python
-Group:		Applications/Multimedia
-Summary:	Python extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description python
-Python extensions for %{name}.
-
-%files python
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/python
-%{_libdir}/%{name}/python/*
-
-#------------------------------------------------------------------
-%package ruby
-Group:		Applications/Multimedia
-Summary:	Ruby extension for %{name}
-Requires:	%{name} = %{version}-%{release}
-
-%description ruby
-Ruby extensions for %{name}.
-
-%files ruby
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/ruby
-%{_libdir}/%{name}/ruby/*
-
-#------------------------------------------------------------------
-%package tcl
-Group:		Applications/Multimedia
-Summary:	Tcl extension & tools for %{name}
-Requires:	%{name} = %{version}-%{release} tcl >= 8.3 tk
-
-%description tcl
-Various tcl packages (extensions) for the %{name} tools.
-
-%files tcl
-%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/tcl
-%{_libdir}/%{name}/tcl/*
-%{_libdir}/%{name}/pkgIndex.tcl
-%{_datadir}/%{name}/demo
-%{_mandir}/mann/*.n*
-
-#------------------------------------------------------------------
-%package devel
-Group:		Development/Libraries
-Summary:	Development package for %{name}
-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 %{name}.
-
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}
+%{_includedir}/graphviz
-%{_libdir}/%{name}/*.so
+%{_libdir}/*.so
+%{_libdir}/graphviz/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*.3*
-%exclude %{_libdir}/%{name}/*/*
 
-#------------------------------------------------------------------
+%files devil
-%package graphs
-Group:		Applications/Multimedia
-Summary:	Demo graphs for %{name}
-
-%description graphs
-Some demo graphs for %{name}.
-
-%files graphs
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
+%{_libdir}/graphviz/libgvplugin_devil.so.*
-%{_datadir}/%{name}/graphs
-
-#------------------------------------------------------------------
-%package doc
-Group:		Documentation
-Summary:	PDF and HTML documents for %{name}
-
-%description doc
-Provides some additional PDF and HTML documentation for %{name}.
 
 %files doc
 %defattr(-,root,root,-)
 %doc __doc/*
 
-#------------------------------------------------------------------
+%files gd
-%prep
+%defattr(-,root,root,-)
-%setup -q
+%{_libdir}/graphviz/libgvplugin_gd.so.*
 
-%build
+%files graphs
-%configure --disable-static --with-mylibgd --disable-io
+%defattr(-,root,root,-)
-%__make %{?_smp_mflags}
+%dir %{_datadir}/graphviz
+%{_datadir}/graphviz/graphs
 
-%install
+%files guile
-rm -rf $RPM_BUILD_ROOT __doc
+%defattr(-,root,root,-)
-%{__make} \
+%{_libdir}/graphviz/guile/
-    DESTDIR=$RPM_BUILD_ROOT \
+%{_mandir}/mann/gv_guile.n*
-    docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
-    pkgconfigdir=%{_libdir}/pkgconfig \
-    install
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-#find ${RPM_BUILD_ROOT} -type f -name "*.a" -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
 
-%clean
+%files java
-rm -rf $RPM_BUILD_ROOT
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/java/
+%{_mandir}/mann/gv_java.n*
 
-# run "dot -c" to generate plugin config in %{_libdir}/%{name}/config
+%files lua
-%post
+%defattr(-,root,root,-)
-%{_bindir}/dot -c
+%{_libdir}/graphviz/lua/
+%{_libdir}/lua*/*
+%{_mandir}/mann/gv_lua.n*
 
-# if there is not dot after everything else is done, the remove config
+%if %{MING}
-%postun
+%files ming
-if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/libgvplugin_ming.so.*
+%{_libdir}/graphviz/*fdb
+%endif
+
+%if %{OCAML}
+%files ocaml
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/ocaml/
+%{_mandir}/mann/gv_ocaml.n*
+%endif
+
+%files perl
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/perl/
+%{_libdir}/perl*/*
+%{_mandir}/mann/gv_perl.n*
+
+%files php
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
+%{_libdir}/graphviz/php/
+%{php_extdir}/gv.so
+%{_datadir}/php*/*
+%{_mandir}/mann/gv_php.n*
+
+%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
-* Wed Oct 04 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.8-5
+* Wed Jan 27 2010 Dennis Gilmore <dennis@ausil.us> - 2.20.3-5.3
-- Bump-n-build
+- add patch to tell things that sparc64 has a LIBPOSTFIX of 64
 
-* Thu Sep 14 2006 Patrick "Jima" Laughton <jima@beer.tclug.org>	- 2.8-4
+* Wed Jan 27 2010 Dennis Gilmore <dennis@ausil.us> - 2.20.3-5.2
-- Fixing BZ#188148 & BZ#184171
+- disable tests on sparc arches in addition to the ppc ones
-- Dropped the unified spec file logic; it complicated matters unnecessarily
-- Removed VERY broken fc5/fc4/fc3 conditionals
-- Removed redundant BuildReqs
-- Disabled io support due to not knowing what it was
-- General cleanup
-- Lots of help from Alex Lancaster on this package! Thanks!
 
-* Wed Mar 01 2006 Oliver Falk <oliver@linux-kernel.at>		- 2.8-3
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20.3-5.1
-- Add libtool-ltdl, libtool-ltdl-devel
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-- Fix fixes
 
-* Fri Feb 24 2006 Oliver Falk <oliver@linux-kernel.at>		- 2.8-2
+* Mon Jul 13 2009 Remi Collet <Fedora@FamilleCollet.com> 2.20.3-4.1
-- Fix unpackaged files on x86_64
+- fix mistake in make rtest fix
 
-* Wed Feb 22 2006 Oliver Falk <oliver@linux-kernel.at>		- 2.8-1
+* Mon Jul 13 2009 Remi Collet <Fedora@FamilleCollet.com> 2.20.3-4
-- Merge with specfile from Paul F. Johnson
+- rebuild for new PHP 5.3.0 ABI (20090626)
-- Update
+- add PHP ABI check
+- use php_extdir (and don't own it)
+- add php configuration file (/etc/php.d/graphviz.ini)
 
-* Mon Feb 13 2006 Oliver Falk <oliver@linux-kernel.at>		- 2.6-4
+* Mon Mar  2 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.20.3-3
-- BR: ruby-devel
+- 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)
 
-* Mon Nov 21 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.6-3
+* Wed Feb 25 2009 John Ellson <ellson@graphviz.org> 2.20.3-2.2
-- Rebuild
+- fixes for swig changes
 
-* Fri Nov 04 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.6-2
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20.3-1.3
-- BuildRequires fixes for "Modular X"; Thanks to John Ellson
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Aug 29 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.6-1
+* Wed Feb 11 2009 Karsten Hopp <karsten@redhat.com> 2.20.3-.2
-- Update
+- make it build on s390, s390x (#469044)
 
-* Mon Aug 22 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.4-2
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.20.3-1.1
-- Bug #163840
+- Rebuild for Python 2.6
 
-* Thu Aug 11 2005 Oliver Falk <oliver@linux-kernel.at>		- 2.4-1
+* Mon Nov 24 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.20.3-1
-- Update
+- update to 2.20.3
-- Took over maintainership
-- Merge with spec provided within source tarball
 
-* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 2.2.1-2
+* Sat Nov 22 2008 Rex Dieter <rdieter@fedoraproject.org> 2.16.1-0.7
-- rebuild on all arches
+- respin (libtool)
 
-* Fri Apr  7 2005 John Ellson <ellson@research.att.com> - 2.2.1-1
+* Mon Jul  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.16.1-0.6
-- update to graphviz-2.2.1
+- fix conditional comparison
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.16.1-0.5
-- rebuilt
+- add Requires for versioned perl (libperl.so)
 
-* Sun Jan 23 2005 John Ellson <ellson@research.att.com> - 0:2.2-3
+* Tue Mar 04 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16.1-0.4
-- change BuildRequires to /bin/ksh, since ksh doesn't provide a /usr/bin/ksh
+- Disable R support
-- change devel exclude to also exclude libtcl*.la
 
-* Sat Jan 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2-2
+* Mon Mar 03 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16.1-0.2
-- Move -doc back to %%{__docdir}, remove unused docdir=... from build.
+- New upstream release (fixes BZ#433205, BZ#427376)
-- Own %%{_datadir}/%%{name} in -graphs.
+- Merged spec changes in from upstream
-- Require tcl and tk in -tcl.
+- Added patch from BZ#432683
-- Require pkgconfig in -devel, fix *.pc install location.
-- Build without dependency tracking.
-- Honor $RPM_OPT_FLAGS again.
-- Move dotneato-config to -devel.
-- Fix lefty/* permissions.
 
-* Sat Jan 22 2005 John Ellson <ellson@research.att.com> - 0:2.2-1
+* Tue Feb 12 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.3
-- Updated to 2.2
+- Added upstream-provided patch for building under GCC 4.3 (thanks John!)
-- split out:
-    graphviz-docs    - optional and large
-    graphviz-graphs  - optional demo graphs
-    graphviz-tcl     - optional, of interest only to tcl users, requires tcl
-- avoid use of %%configure which breaks on RH73
-- add some pkgconfigs - probably in wrong place they're a bit experimental
-  so OK for now
-- add BuildRequires /usr/bin/ksh  (either pdksh or the real one)
 
-* Thu Jun  3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.12-0.fdr.2
+* Thu Jan  3 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.2
-- BuildRequire m4 to work around https://bugzilla.redhat.com/108655 on FC1.
+- Re-added tcl/tk 8.5 patch
+- Tweaked ming stuff
 
-* Tue May 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.12-0.fdr.1
+* Thu Jan  3 2008 Alex Lancaster <alexlan[AT]fedoraproject.org> - 2.16-3.1
-- Update to 1.12.
+- Rebuild against new Tcl 8.5
 
-* Tue Nov 11 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.3
+* Wed Dec 12 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-2
-- Applied patch to fix build on FC1
+- What the heck?  Can't BR stuff that hasn't even gotten reviewed yet.
 
-* Sat Aug 23 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.2
+* Wed Nov 28 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-1
-- Hopefully fixed BuildRequires
+- New upstream release
+- Remove arith.h patch
 
-* Sun Aug 17 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.2
+* Tue Sep 04 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.14.1-3
-- Added some BuildRequires to satisfy build conditions on severn.
+- Patch to resurrect arith.h
 
-* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 0:1.10-0.fdr.1
+* Thu Aug 23 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.14.1-2
-- Added _smp_mflags
+- Added perl-devel to BR for F7+
-- Removed "transform='s,x,x,'" configure arg
 
-* Tue Jul 29 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.10-0.fdr.1
+* Wed Aug 15 2007 John Ellson <ellson@research.att.com>
-- Update to 1.10.
+- release 2.14.1 - see ChangeLog for details
-- BuildRequires expat-devel.
+* Wed Aug 2 2007 John Ellson <ellson@research.att.com>
-- Include *.la (uses ltdl).
+- release 2.14 - see ChangeLog for details
-- %%configure in %%build.
+* Fri Mar 16 2007 Stephen North <north@research.att.com>
+- remove xorg-X11-devel from rhel >= 5
+* Mon Dec 11 2006 John Ellson <john.ellson@comcast.net>
+- fix graphviz-lua description (Fedora BZ#218191)
+* Tue Sep 13 2005 John Ellson <ellson@research.att.com>
+- split out language bindings into their own rpms so that 
+  main rpm doesn't depend on (e.g.) ocaml
 
-* Thu Jul 10 2003 Dams <anvil[AT]livna.org> 0:1.9-0.fdr.1
+* Sat Aug 13 2005 John Ellson <ellson@research.att.com>
-- Updated to 1.9
+- imported various fixes from the Fedora-Extras .spec by Oliver Falk <oliver@linux-kernel.at>
-- Split devel package
 
-* Tue Jul  8 2003 Dams <anvil[AT]livna.org> 0:1.7.14-0.fdr.1
+* Wed Jul 20 2005 John Ellson <ellson@research.att.com>
-- Applied fedora spec file look&feel
+- release 2.4
-
-* Tue Jan  1 2002 Jeff Johnson <jbj@redhat.com>
-- update to 1.7.14.
-
-* Wed Apr 25 2001 Jeff Johnson <jbj@redhat.com>
-- repackage for powertools.
-- simplify spec file.
-- add -ffast-math for all arch's, not just ix86.
-- remove Requires: webfonts.

sources

@@ -1 +1 @@
-ca921b4a9bcd86da4a1092bb17a57d83  graphviz-2.8.tar.gz
+4d94c4b809a5c095acfc973d8d207fa9  graphviz-2.20.3.tar.gz