dist-git conversion

#2781)

.cvsignore

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

.gitignore

@@ -0,0 +1 @@
+graphviz-2.16.1.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-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-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-tk8.5.patch

@@ -1,37 +1,37 @@
-diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure
+diff -urN graphviz-2.16.orig/configure graphviz-2.16/configure
---- graphviz-2.12/configure	2006-12-04 16:02:10.000000000 -0600
+--- graphviz-2.16.orig/configure	2007-11-09 23:41:41.000000000 -0600
-+++ graphviz-2.12-patched/configure	2007-02-07 08:20:19.000000000 -0600
++++ graphviz-2.16/configure	2008-01-03 08:52:00.000000000 -0600
-@@ -26251,8 +26251,8 @@
+@@ -28003,8 +28003,8 @@
- fi;
+ 
  
  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 "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_TCLSH+set}" = set; then
-@@ -26291,8 +26291,8 @@
+@@ -28044,8 +28044,8 @@
- fi
+ 
  
      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 "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_TCLSH+set}" = set; then
-@@ -26331,7 +26331,47 @@
+@@ -28085,7 +28085,48 @@
- fi
+ 
  
          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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++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 "$as_me:$LINENO: result: $TCLSH" >&5
-+echo "${ECHO_T}$TCLSH" >&6
++echo "${ECHO_T}$TCLSH" >&6; }
 +else
-+  echo "$as_me:$LINENO: result: no" >&5
++  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++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 "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-@@ -26370,6 +26410,7 @@
+@@ -28125,6 +28166,7 @@
- echo "${ECHO_T}no" >&6
  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 "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_WISH+set}" = set; then
-@@ -26714,7 +26755,47 @@
+@@ -28454,8 +28496,8 @@
- 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
 +    	    # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ 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 "$as_me:$LINENO: result: $WISH" >&5
-+echo "${ECHO_T}$WISH" >&6
++echo "${ECHO_T}$WISH" >&6; }
 +else
-+  echo "$as_me:$LINENO: result: no" >&5
++  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++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
 +                    # 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 "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-@@ -26793,6 +26874,7 @@
+@@ -28535,6 +28618,7 @@
- echo "${ECHO_T}no" >&6
  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 @@
+@@ -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 -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 @@
  # -----------------------------------
  # tkInt.h
  if test -f "$TK_SRC_DIR/generic/tkInt.h"; then

graphviz.spec

@@ -1,23 +1,30 @@
-# $Id: graphviz.spec.in,v 1.96 2006/10/24 13:46:11 ellson Exp $ $Revision: 1.96 $
+# $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: graphviz requires gd with gif support (and other fixes), hence use
+# Note: pre gd-2.0.34 graphviz uses its own gd tree with gif support and other fixes
-# internal one for now.
 
-#-- graphviz src.rpm --------------------------------------------------------
+#-- Global graphviz rpm and src.rpm tags-------------------------------------
 Name:    graphviz
-Version:	2.12
+Summary: Graph Visualization Tools
-Release:	7%{?dist}
+Version: 2.16.1
 
+%define truerelease 0.6
+%{?distroagnostic: %define release %{truerelease}}
+%{!?distroagnostic: %define release %{truerelease}%{?dist}}
+
+Release: %{?release}
+
+Group:   Applications/Multimedia
 License: CPL
 URL:     http://www.graphviz.org/
-Source:		http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz
+Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-Patch0:		%{name}-php5.patch
+Patch0:  %{name}-tk8.5.patch
-Patch1:		%{name}-libcdt.patch
+Patch1:  %{name}-gcc43.patch
+Patch2:  %{name}-multilib.patch
 
-# graphviz is relocatable
+# graphviz is relocatable - Caution: this feature is used in AT&T,
+#   but probably will not be supported in Redhat/Fedora/Centos distros
 #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
@@ -34,10 +41,14 @@ Patch1:		%{name}-libcdt.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
-%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
@@ -53,74 +64,102 @@ BuildRequires:	/bin/ksh bison m4 flex tk tcl >= 8.3 swig
 # 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 PERL	1
 %define TCL    1
-BuildRequires: XFree86-devel perl
-%endif
-
-%if 0%{?rhel}
-%define PERL	1
-%define TCL	1
-BuildRequires: perl
-%if "%rhel" < "4"
 BuildRequires: XFree86-devel
 %endif
-%if "%rhel" >= "3"
+
+#-- 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 "%rhel" >= "4"
+%if 0%{?rhel} == 4
-%define PHP	1
+BuildRequires: xorg-x11-devel
-%define RUBY	1
-BuildRequires: xorg-x11-devel php-devel ruby ruby-devel
 %endif
-%if "%rhel" >= "5"
+%if 0%{?rhel} >= 4
-BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel
+# 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 "%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 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
+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
 %define SHARP  1
 %define OCAML  1
 BuildRequires: mono-core ocaml
 %endif
 %endif
-%if "%fedora" >= "6"
+%if 0%{?fedora} >= 6
 %define LUA    1
-BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel
+%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
 
-#-- graphviz rpm --------------------------------------------------
+#-- main graphviz rpm ------------------------------------------------
-Group:		Applications/Multimedia
-Summary:	Graph Visualization Tools
 Requires:         urw-fonts
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -129,6 +168,18 @@ Requires(postun):	/sbin/ldconfig
 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
@@ -137,40 +188,89 @@ 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.*
-
+%if %{DEVIL}
-# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
+%exclude %{_libdir}/graphviz/libgvplugin_devil.*
-%post
+%endif
-%{_bindir}/dot -c
+%if %{MING}
-/sbin/ldconfig
+%exclude %{_libdir}/graphviz/libgvplugin_ming.*
-
+%exclude %{_libdir}/graphviz/*fdb
-# if there is no dot after everything else is done, the remove config
+%endif
-%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}
+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.*
 
+#-- 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 gd
+%post devil
 %{_bindir}/dot -c
 
-# if there is not dot after everything else is done, the remove config
+%postun devil
-%postun gd
+[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || :
-if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/graphviz/config; fi
+
+%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}
@@ -186,6 +286,7 @@ C# extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/sharp
 %{_libdir}/graphviz/sharp/*
+%{_mandir}/mann/gv_sharp.n*
 %endif
 
 #-- graphviz-guile rpm --------------------------------------------
@@ -202,6 +303,7 @@ Guile extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/guile
 %{_libdir}/graphviz/guile/*
+%{_mandir}/mann/gv_guile.n*
 %endif
 
 #-- graphviz-io rpm -----------------------------------------------
@@ -218,6 +320,7 @@ Io extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/io
 %{_libdir}/graphviz/io/*
+%{_mandir}/mann/gv_io.n*
 %endif
 
 #-- graphviz-java rpm ---------------------------------------------
@@ -234,6 +337,7 @@ Java extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/java
 %{_libdir}/graphviz/java/*
+%{_mandir}/mann/gv_java.n*
 %endif
 
 #-- graphviz-lua rpm ----------------------------------------------
@@ -250,6 +354,7 @@ Lua extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/lua
 %{_libdir}/graphviz/lua/*
+%{_mandir}/mann/gv_lua.n*
 %endif
 
 #-- graphviz-ocaml rpm --------------------------------------------
@@ -266,6 +371,7 @@ Ocaml extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/ocaml
 %{_libdir}/graphviz/ocaml/*
+%{_mandir}/mann/gv_ocaml.n*
 %endif
 
 #-- graphviz-perl rpm ---------------------------------------------
@@ -273,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.
@@ -282,6 +389,7 @@ Perl extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/perl
 %{_libdir}/graphviz/perl/*
+%{_mandir}/mann/gv_perl.n*
 %endif
 
 #-- graphviz-php rpm ----------------------------------------------
@@ -298,6 +406,7 @@ PHP extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/php
 %{_libdir}/graphviz/php/*
+%{_mandir}/mann/gv_php.n*
 %endif
 
 #-- graphviz-python rpm -------------------------------------------
@@ -314,6 +423,24 @@ Python extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/python
 %{_libdir}/graphviz/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
+
+%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 ---------------------------------------------
@@ -330,6 +457,7 @@ Ruby extension for graphviz.
 %defattr(-,root,root,-)
 %dir %{_libdir}/graphviz/ruby
 %{_libdir}/graphviz/ruby/*
+%{_mandir}/mann/gv_ruby.n*
 %endif
 
 #-- graphviz-tcl rpm ----------------------------------------------
@@ -348,7 +476,10 @@ 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 --------------------------------------------
@@ -403,10 +534,55 @@ Provides some additional PDF and HTML documentation for graphviz.
 %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 ! %{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
+%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 \
@@ -418,57 +594,77 @@ CFLAGS="$RPM_OPT_FLAGS" \
         --mandir=%{_mandir} \
         --with-x \
 	--disable-static \
-	--disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING}
+        --disable-dependency-tracking \
-%__make %{?_smp_mflags}
+	%{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}
 
 %install
-rm -rf $RPM_BUILD_ROOT __doc
+rm -rf %{buildroot} __doc
-%{__make} \
+make DESTDIR=%{buildroot} \
-	DESTDIR=$RPM_BUILD_ROOT \
+        docdir=%{buildroot}%{_docdir}/%{name} \
-	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name} \
         pkgconfigdir=%{_libdir}/pkgconfig \
         install
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
+chmod -x %{buildroot}%{_datadir}/%{name}/lefty/*
-cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc
+cp -a %{buildroot}%{_datadir}/%{name}/doc __doc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
+rm -rf %{buildroot}%{_datadir}/%{name}/doc
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+# regression test
+cd rtest
+make rtest
+# clean up temporary installation
+rm -rf %{buildroot}
 
 #-- changelog --------------------------------------------------
 
 %changelog
-* Sat May 05 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-7
+* Mon Jul  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.16.1-0.6
-- Patch to fix BZ#237496
+- fix conditional comparison
-- 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 <jima@beer.tclug.org> 2.12-6
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.16.1-0.5
-- Removed patch, as tcl/tk got rolled back to 8.4
+- add Requires for versioned perl (libperl.so)
 
-* Wed Feb 07 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-5
+* Tue Mar 04 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16.1-0.4
-- Added patch for slightly broken tk 8.5
+- Disable R support
 
-* Thu Feb 01 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-4
+* Mon Mar 03 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16.1-0.2
-- Bump-n-build due to tk upgrade
+- New upstream release (fixes BZ#433205, BZ#427376)
+- Merged spec changes in from upstream
+- Added patch from BZ#432683
 
-* Wed Jan 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-3
+* Tue Feb 12 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.3
-- Added running of /sbin/ldconfig in post/postun (and Reqs)
+- Added upstream-provided patch for building under GCC 4.3 (thanks John!)
-- 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 <jima@beer.tclug.org> 2.12-2
+* Thu Jan  3 2008 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.16-3.2
-- Use of RPM_INSTALL_PREFIX0 in %%post requires Prefix: to be set
+- Re-added tcl/tk 8.5 patch
+- Tweaked ming stuff
 
-* Mon Dec 11 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 2.12-1
+* Thu Jan  3 2008 Alex Lancaster <alexlan[AT]fedoraproject.org> - 2.16-3.1
-- Fixed dist tag
+- Rebuild against new Tcl 8.5
-- Fixed minor typo in -lua description (BZ#218191)
-- Added upstream-supplied "php5" patch (due to newer swig)
-- Added BR: java-devel & R: java
 
+* 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

sources

@@ -1 +1 @@
-e5547bc0ec47943c72f5c3e2b5dff58f  graphviz-2.12.tar.gz
+8952fb2a627b38e38ed429a3a9d5cc5c  graphviz-2.16.1.tar.gz