dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 17:01:57 +00:00 · 2009-11-26 02:03:00 +00:00 · 2009-06-10 19:55:00 +00:00 · 2009-04-15 06:34:58 +00:00 · 2009-03-03 01:59:37 +00:00 · 2009-02-27 14:25:33 +00:00
13 changed files with 653 additions and 562 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +0,0 @@
-graphviz-2.12.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+graphviz-2.20.3.tar.gz
--- a/21
+++ b/21
@ -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)
--- a/graphviz-2.20.3-configure-php.patch
+++ 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
--- a/graphviz-2.20.3-gv.i.patch
+++ 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
+-
+ %}
--- a/graphviz-2.20.3-sparc64-is-64bit.patch
+++ b/graphviz-2.20.3-sparc64-is-64bit.patch
@ -0,0 +1,11 @@
+--- graphviz-2.20.3/configure.BAD	2009-06-10 15:30:55.000000000 -0400
+++ graphviz-2.20.3/configure	2009-06-10 15:31:52.000000000 -0400
+@@ -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
--- a/graphviz-arith.patch
+++ 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
--- a/graphviz-black.patch
+++ 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: 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 */
--- a/graphviz-gcc43.patch
+++ 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 <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"
+ %}
+ 
--- a/graphviz-multilib.patch
+++ 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);
--- 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
--- a/graphviz.spec
+++ b/graphviz.spec
@ -1,133 +1,274 @@
-# $Id: graphviz.spec.in,v 1.96 2006/10/24 13:46:11 ellson Exp $ $Revision: 1.96 $
-# 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.
-
-#-- graphviz src.rpm --------------------------------------------------------
-Name:		graphviz
-Version:	2.12
-Release:	7%{?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
-
-# graphviz is relocatable
-#Prefix: /usr
-# not until we can figure out why relocatabilty is broken
-
-#-- 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 TCL	1
-%define IPSEPCOLA	--without-ipsepcola
-%define MYLIBGD		--with-mylibgd
-%define MING		--without-ming
-
-# 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
-
-%if 0%{?rhl}
-%define PERL	1
-%define TCL	1
-BuildRequires: XFree86-devel perl
+Name:			graphviz
+Summary:		Graph Visualization Tools
+Version:		2.20.3
+Release:		4%{?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
+Patch2:                 graphviz-2.20.3-sparc64-is-64bit.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
-
-%if 0%{?rhel}
-%define PERL	1
-%define TCL	1
-BuildRequires: perl
-%if "%rhel" < "4"
-BuildRequires: XFree86-devel
-%endif
-%if "%rhel" >= "3"
-%define IPSEPCOLA --with-ipsepcola
-BuildRequires: fontconfig-devel tcl-devel tk-devel
-%endif
-%if "%rhel" >= "4"
-%define PHP	1
-%define RUBY	1
-BuildRequires: xorg-x11-devel php-devel ruby ruby-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
-%endif
-%endif
-
-%if 0%{?fedora}
-%define PERL	1
-%define TCL	1
-BuildRequires: fontconfig-devel tcl-devel tk-devel 
-%if "%fedora" < "3"
-BuildRequires: XFree86-devel
-%endif
-%if "%fedora" == "3"
-BuildRequires: xorg-x11-devel
-%endif
-%if "%fedora" == "4"
-BuildRequires: xorg-x11-devel
-%endif
-%if "%fedora" >= "3"
-%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
-%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
-%ifnarch ppc64
-%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
-%endif
-%endif
-
-#-- graphviz rpm --------------------------------------------------
-Group:		Applications/Multimedia
-Summary:	Graph Visualization Tools
-Requires:	urw-fonts
-Requires(post):	/sbin/ldconfig
+Requires:		urw-fonts
+Requires(post):		/sbin/ldconfig
 Requires(postun):	/sbin/ldconfig

+# Necessary conditionals
+%ifarch ppc64 s390 s390x sparc64
+%global SHARP  0
+%global OCAML  0
+%else
+%global SHARP  1
+%global OCAML  1
+%endif
+# 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
+%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
+
+%check
+%ifnarch ppc64 ppc sparc64
+# regression test, segfaults on ppc/ppc64/sparc64, 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,-)
@ -137,338 +278,192 @@ 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}
-
-%description gd
-graphviz plugin for renderers based on gd
-
-%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
-
-%description sharp
-C# extension for graphviz.
-
-%files sharp
-%defattr(-,root,root,-)
-%dir %{_libdir}/graphviz/sharp
-%{_libdir}/graphviz/sharp/*
+%exclude %{_libdir}/graphviz/libgvplugin_devil.*
+%if %{MING}
+%exclude %{_libdir}/graphviz/libgvplugin_ming.*
+%exclude %{_libdir}/graphviz/*fdb
 %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/*
-%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/*
-%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/*
-%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/*
-%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/*
-%endif
-
-#-- graphviz-perl rpm ---------------------------------------------
-%if %{PERL}
-%package perl
-Group:		Applications/Multimedia
-Summary:	Perl extension for graphviz
-Requires:	graphviz = %{version}-%{release} perl
-
-%description perl
-Perl extension for graphviz.
-
-%files perl
-%defattr(-,root,root,-)
-%dir %{_libdir}/graphviz/perl
-%{_libdir}/graphviz/perl/*
-%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/*
-%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/*
-%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/*
-%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}/graphviz/pkgIndex.tcl
-%{_datadir}/graphviz/demo
-%{_mandir}/mann/*.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
-# 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}
+%if %{MING}
+%files ming
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/libgvplugin_ming.so.*
+%{_libdir}/graphviz/*fdb
+%endif

-%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
+%if %{OCAML}
+%files ocaml
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/ocaml/
+%{_mandir}/mann/gv_ocaml.n*
+%endif

-%clean
-rm -rf $RPM_BUILD_ROOT
+%files perl
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/perl/
+%{_libdir}/perl*/*
+%{_mandir}/mann/gv_perl.n*
+
+%files php
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/php/
+%{_libdir}/php*/*
+%{_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 --------------------------------------------------

 %changelog
-* Sat May 05 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 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 Jun 10 2009 Dennis Gilmore <dennis@ausil.us> 2.20.3-4
+- disablre regression tests on sparc64 as well as ppc/ppc64

-* Wed Feb 14 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-6
- Removed patch, as tcl/tk got rolled back to 8.4
+* Mon Mar  2 2009 Tom "spot" Callaway <tcallawa@redhat.com> 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 07 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-5
- Added patch for slightly broken tk 8.5
+* Wed Feb 25 2009 John Ellson <ellson@graphviz.org> 2.20.3-2.2
+- fixes for swig changes

-* Thu Feb 01 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-4
- Bump-n-build due to tk upgrade
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20.3-1.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

-* Wed Jan 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 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 Feb 11 2009 Karsten Hopp <karsten@redhat.com> 2.20.3-.2
+- make it build on s390, s390x (#469044)

-* Wed Dec 13 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-2
- Use of RPM_INSTALL_PREFIX0 in %%post requires Prefix: to be set
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.20.3-1.1
+- Rebuild for Python 2.6

-* Mon Dec 11 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 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
+* Mon Nov 24 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.20.3-1
+- update to 2.20.3

+* Sat Nov 22 2008 Rex Dieter <rdieter@fedoraproject.org> 2.16.1-0.7
+- respin (libtool)
+
+* Mon Jul  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.16.1-0.6
+- fix conditional comparison
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.16.1-0.5
+- add Requires for versioned perl (libperl.so)
+
+* Tue Mar 04 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16.1-0.4
+- Disable R support
+
+* Mon Mar 03 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 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 <jima@beer.tclug.org> 2.16-3.3
+- Added upstream-provided patch for building under GCC 4.3 (thanks John!)
+
+* Thu Jan  3 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.2
+- Re-added tcl/tk 8.5 patch
+- Tweaked ming stuff
+
+* Thu Jan  3 2008 Alex Lancaster <alexlan[AT]fedoraproject.org> - 2.16-3.1
+- Rebuild against new Tcl 8.5
+
+* Wed Dec 12 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-2
+- What the heck?  Can't BR stuff that hasn't even gotten reviewed yet.
+
+* Wed Nov 28 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-1
+- New upstream release
+- Remove arith.h patch
+
+* Tue Sep 04 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.14.1-3
+- Patch to resurrect arith.h
+
+* Thu Aug 23 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.14.1-2
+- Added perl-devel to BR for F7+
+
+* Wed Aug 15 2007 John Ellson <ellson@research.att.com>
+- release 2.14.1 - see ChangeLog for details
+* Wed Aug 2 2007 John Ellson <ellson@research.att.com>
+- release 2.14 - see ChangeLog for details
+* 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
--- a/2
+++ b/2
@ -1 +1 @@
-e5547bc0ec47943c72f5c3e2b5dff58f  graphviz-2.12.tar.gz
+4d94c4b809a5c095acfc973d8d207fa9  graphviz-2.20.3.tar.gz
Author	SHA1	Message	Date
Fedora Release Engineering	172c4a2d07	dist-git conversion	2010-07-28 17:01:57 +00:00
Bill Nottingham	349b7970c1	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 02:03:00 +00:00
Dennis Gilmore	aebf3ebea5	dont run tests on sparc64 same as ppc ppc64 add patch so graphviz knows sparc linux use /usr/lib64	2009-06-10 19:55:00 +00:00
Jesse Keating	73af6edf95	Initialize branch F-11 for graphviz	2009-04-15 06:34:58 +00:00
Tom Callaway	653d31718f	fix this package up	2009-03-03 01:59:37 +00:00
Tom Callaway	37bfcf2d96	pick up patches from John Ellson (bz 486045)	2009-02-27 14:25:33 +00:00
Jesse Keating	94f9d71020	- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild	2009-02-25 00:56:05 +00:00
Karsten Hopp	e0b24415c4	- make it build on s390, s390x (#469044 )	2009-02-11 15:29:20 +00:00
Ignacio Vazquez-Abrams	f50c0663bc	Rebuild for Python 2.6	2008-11-29 16:37:11 +00:00
Tom Callaway	80ca8165c2	2.20.3	2008-11-24 22:27:18 +00:00
Rex Dieter	9f808eb5bb	- respin (libtool)	2008-11-22 20:46:56 +00:00
Tom Callaway	7c317b68ff	fix conditional comparison	2008-07-07 18:12:57 +00:00
Tom Callaway	e6f63db300	add Requires for versioned perl (libperl.so)	2008-03-18 18:15:51 +00:00
Patrick Laughton	706a379e2f	- Disable R support	2008-03-04 18:41:07 +00:00
Patrick Laughton	2cb7e50fa9	- New upstream release (fixes BZ#433205, BZ#427376) - Merged spec changes in from upstream - Added patch from BZ#432683	2008-03-03 16:05:19 +00:00
Patrick Laughton	9fe1dd4853	- Added upstream-provided patch for building under GCC 4.3 (thanks John!)	2008-02-12 17:53:11 +00:00
Patrick Laughton	c472fbb836	- Re-added tcl/tk 8.5 patch - Tweaked ming stuff FWIW, it won't build with this patch, either, but it still helps. :-)	2008-01-04 05:11:28 +00:00
alexlan	34ed651fc5	Bump spec, tag conflict	2008-01-04 04:28:39 +00:00
alexlan	723166103e	- Rebuild against new Tcl 8.5	2008-01-04 04:22:28 +00:00
Patrick Laughton	01d64f6f86	- What the heck? Can't BR stuff that hasn't even gotten reviewed yet. (upstream wackiness)	2007-12-12 18:25:45 +00:00
Patrick Laughton	952af34d25	- New upstream release - Remove arith.h patch	2007-11-28 18:17:02 +00:00
Patrick Laughton	acbab6d307	- Patch to resurrect arith.h	2007-09-05 03:07:20 +00:00
Patrick Laughton	09a99bb6d0	- 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. :-)	2007-08-23 16:40:18 +00:00
Patrick Laughton	f7a4a4bb77	- 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).	2007-08-23 16:37:55 +00:00
Patrick Laughton	6c8ab90b85	- Patch to fix BZ#241790 (thanks John!)	2007-07-12 19:43:18 +00:00