- up to 1.9, updated lt14d (also for lt 1.5) and system-gd patches

Changed files:
    graphviz-lt14d.patch -> 1.2
    graphviz-system-gd.patch -> 1.2
    graphviz.spec -> 1.16

diff --git a/graphviz-lt14d.patch b/graphviz-lt14d.patch
index 7c149423f09bf33aa226a4fda2db2ccd832262e3..a25ebcec401cb5e65876befb076fc087fcbe94a8 100644 (file)
--- a/graphviz-lt14d.patch
+++ b/graphviz-lt14d.patch
@@ -1,20 +1,22 @@
---- graphviz-1.8.9/tclstubs/Makefile.am.orig   Thu Feb 21 23:16:54 2002
-+++ graphviz-1.8.9/tclstubs/Makefile.am        Sat Aug 10 01:57:27 2002
+--- graphviz-1.9/tclstubs/Makefile.am.orig     2003-01-15 18:22:17.000000000 +0100
++++ graphviz-1.9/tclstubs/Makefile.am  2003-05-15 20:46:27.000000000 +0200
 @@ -15,6 +15,6 @@
  # override normal libtool rule
  tclStubLib.lo : @TCL_STUB_LIB_PATH@
        ar -x @TCL_STUB_LIB_PATH@
--      mv tclStubLib.o tclStubLib.lo
-+      echo -e "# Generated by libtool\npic_object='tclStubLib.o'" > tclStubLib.lo
+-      cp -f tclStubLib.@OBJEXT@ $@
++      echo -e "# Generated by libtool\npic_object='tclStubLib.@OBJEXT@'" > $@
  
- EXTRA_DIST = nmakefile Makefile.old
---- graphviz-1.8.9/tkstubs/Makefile.am.orig    Thu Feb 21 23:16:54 2002
-+++ graphviz-1.8.9/tkstubs/Makefile.am Sat Aug 10 10:37:49 2002
-@@ -15,5 +15,5 @@
+ EXTRA_DIST = nmakefile Makefile.old CVS/*
+--- graphviz-1.9/tkstubs/Makefile.am.orig      2003-01-15 18:22:18.000000000 +0100
++++ graphviz-1.9/tkstubs/Makefile.am   2003-05-15 20:47:24.000000000 +0200
+@@ -15,7 +15,7 @@
  # override normal libtool rule
  tkStubLib.lo tkStubImg.lo: @TK_STUB_LIB_PATH@
        ar -x @TK_STUB_LIB_PATH@
--      mv tkStubLib.o tkStubLib.lo
--      mv tkStubImg.o tkStubImg.lo
-+      echo -e "# Generated by libtool\npic_object='tkStubLib.o'" > tkStubLib.lo
-+      echo -e "# Generated by libtool\npic_object='tkStubImg.o'" > tkStubImg.lo
+-      cp -f tkStubLib.@OBJEXT@ tkStubLib.lo
+-      cp -f tkStubImg.@OBJEXT@ tkStubImg.lo
++      echo -e "# Generated by libtool\npic_object='tkStubLib.@OBJEXT@'" > tkStubLib.lo
++      echo -e "# Generated by libtool\npic_object='tkStubImg.@OBJEXT@'" > tkStubImg.lo
+ 
+ EXTRA_DIST = CVS/*

diff --git a/graphviz-system-gd.patch b/graphviz-system-gd.patch
index e1592c87cefc5d12ca78e9da3797cb551cc5c7ad..aa03e44fa653e4e1d245dbd1b8bf5fe9f9798128 100644 (file)
--- a/graphviz-system-gd.patch
+++ b/graphviz-system-gd.patch
@@ -1,95 +1,104 @@
---- graphviz-1.8.9/dotneato/Makefile.am.orig   Fri Aug  2 05:13:43 2002
-+++ graphviz-1.8.9/dotneato/Makefile.am        Sat Aug 10 02:06:45 2002
-@@ -39,8 +39,7 @@
-       common/libdotneato.la \
-       ../pathplan/libpathplan.la \
-       ../graph/libgraph.la \
--      ../cdt/libcdt.la \
--      ../gd/libgd.la
-+      ../cdt/libcdt.la -lgd
+--- graphviz-1.9/dotneato/Makefile.am.orig     2003-01-15 21:04:57.000000000 +0100
++++ graphviz-1.9/dotneato/Makefile.am  2003-05-15 20:26:05.000000000 +0200
+@@ -43,16 +43,14 @@
+       $(top_srcdir)/dotneato/pack/libpack.la \
+       $(top_srcdir)/pathplan/libpathplan.la \
+       $(top_srcdir)/graph/libgraph.la \
+-      $(top_srcdir)/cdt/libcdt.la \
+-      $(top_srcdir)/gd/libgdconvenience.la
++      $(top_srcdir)/cdt/libcdt.la -lgd
  
- neato_LDADD = common/libdotneato.la \
-       neatogen/libneato.la \
-@@ -48,8 +47,7 @@
-       common/libdotneato.la \
-       ../pathplan/libpathplan.la \
-       ../graph/libgraph.la \
--      ../cdt/libcdt.la \
--      ../gd/libgd.la
-+      ../cdt/libcdt.la -lgd
+ dot_LDADD = $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/dotneato/dotgen/libdotconvenience.la \
+       $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/pathplan/libpathplan.la \
+       $(top_srcdir)/graph/libgraph.la \
+-      $(top_srcdir)/cdt/libcdt.la \
+-      $(top_srcdir)/gd/libgdconvenience.la
++      $(top_srcdir)/cdt/libcdt.la -lgd
  
- twopi_LDADD = common/libdotneato.la \
-       twopigen/libtwopi.la \
-@@ -58,16 +56,14 @@
-       pack/libpack.la \
-       ../pathplan/libpathplan.la \
-       ../graph/libgraph.la \
--      ../cdt/libcdt.la \
--      ../gd/libgd.la
-+      ../cdt/libcdt.la -lgd
+ neato_LDADD = $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/dotneato/neatogen/libneatoconvenience.la \
+@@ -60,8 +58,7 @@
+       $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/pathplan/libpathplan.la \
+       $(top_srcdir)/graph/libgraph.la \
+-      $(top_srcdir)/cdt/libcdt.la \
+-      $(top_srcdir)/gd/libgdconvenience.la
++      $(top_srcdir)/cdt/libcdt.la -lgd
  
- dotmemtest_LDADD = common/libdotneato.la \
-       dotgen/libdot.la \
-       common/libdotneato.la \
-       ../pathplan/libpathplan.la \
-       ../graph/libgraph.la \
--      ../cdt/libcdt.la \
--      ../gd/libgd.la
-+      ../cdt/libcdt.la -lgd
+ twopi_LDADD = $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/dotneato/twopigen/libtwopiconvenience.la \
+@@ -70,16 +67,14 @@
+       $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/pathplan/libpathplan.la \
+       $(top_srcdir)/graph/libgraph.la \
+-      $(top_srcdir)/cdt/libcdt.la \
+-      $(top_srcdir)/gd/libgdconvenience.la
++      $(top_srcdir)/cdt/libcdt.la -lgd
  
- neatomemtest_LDADD = common/libdotneato.la \
-       neatogen/libneato.la \
-@@ -75,8 +71,7 @@
-       common/libdotneato.la \
-       ../pathplan/libpathplan.la \
-       ../graph/libgraph.la \
--      ../cdt/libcdt.la \
--        ../gd/libgd.la
-+      ../cdt/libcdt.la -lgd
+ dotmemtest_LDADD = $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/dotneato/dotgen/libdotconvenience.la \
+       $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/pathplan/libpathplan.la \
+       $(top_srcdir)/graph/libgraph.la \
+-      $(top_srcdir)/cdt/libcdt.la \
+-      $(top_srcdir)/gd/libgdconvenience.la
++      $(top_srcdir)/cdt/libcdt.la -lgd
  
- twopimemtest_LDADD = common/libdotneato.la \
-       twopigen/libtwopi.la \
-@@ -85,8 +80,7 @@
-       pack/libpack.la \
-       ../pathplan/libpathplan.la \
-         ../graph/libgraph.la \
--        ../cdt/libcdt.la \
--        ../gd/libgd.la
-+        ../cdt/libcdt.la -lgd
+ neatomemtest_LDADD = $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/dotneato/neatogen/libneatoconvenience.la \
+@@ -87,8 +82,7 @@
+       $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/pathplan/libpathplan.la \
+       $(top_srcdir)/graph/libgraph.la \
+-      $(top_srcdir)/cdt/libcdt.la \
+-        $(top_srcdir)/gd/libgdconvenience.la
++      $(top_srcdir)/cdt/libcdt.la -lgd
+ 
+ twopimemtest_LDADD = $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/dotneato/twopigen/libtwopiconvenience.la \
+@@ -97,8 +91,7 @@
+       $(top_srcdir)/dotneato/common/libcommonconvenience.la \
+       $(top_srcdir)/pathplan/libpathplan.la \
+         $(top_srcdir)/graph/libgraph.la \
+-        $(top_srcdir)/cdt/libcdt.la \
+-      $(top_srcdir)/gd/libgdconvenience.la
++        $(top_srcdir)/cdt/libcdt.la -lgd
  
  man_MANS = dot.1 neato.1 twopi.1
  
---- graphviz-1.8.9/gdtclft/Makefile.am.orig    Thu Aug  1 17:43:30 2002
-+++ graphviz-1.8.9/gdtclft/Makefile.am Sat Aug 10 02:07:35 2002
-@@ -17,8 +17,7 @@
+--- graphviz-1.9/gdtclft/Makefile.am.orig      2003-01-15 18:22:13.000000000 +0100
++++ graphviz-1.9/gdtclft/Makefile.am   2003-05-15 20:26:48.000000000 +0200
+@@ -19,8 +19,7 @@
  
  libgdtclft_la_LIBADD = \
-       ../tclhandle/libtclhandle.la \
--      ../gd/libgdconvenience.la \
--      ../tclstubs/libtclstubs.la
-+      ../tclstubs/libtclstubs.la -lgd
+       $(top_srcdir)/tclhandle/libtclhandle.la \
+-      $(top_srcdir)/gd/libgdconvenience.la \
+-      $(top_srcdir)/tclstubs/libtclstubs.la
++      $(top_srcdir)/tclstubs/libtclstubs.la -lgd
  
  all-local: pkgIndex.tcl
  
---- graphviz-1.8.9/tcldot/Makefile.am.orig     Fri Aug  2 22:54:46 2002
-+++ graphviz-1.8.9/tcldot/Makefile.am  Sat Aug 10 02:08:13 2002
+--- graphviz-1.9/tcldot/Makefile.am.orig       2003-01-15 18:35:46.000000000 +0100
++++ graphviz-1.9/tcldot/Makefile.am    2003-05-15 20:27:16.000000000 +0200
 @@ -34,9 +34,8 @@
-         ../pathplan/libpathplanconvenience.la \
-         ../graph/libgraphconvenience.la \
-       ../cdt/libcdtconvenience.la \
--      ../gd/libgdconvenience.la \
-       ../gdtclft/gdtclft.lo \
--      ../tclstubs/libtclstubs.la
-+      ../tclstubs/libtclstubs.la -lgd
+         $(top_srcdir)/pathplan/libpathplanconvenience.la \
+         $(top_srcdir)/graph/libgraphconvenience.la \
+       $(top_srcdir)/cdt/libcdtconvenience.la \
+-      $(top_srcdir)/gd/libgdconvenience.la \
+       $(top_srcdir)/gdtclft/gdtclft.lo \
+-      $(top_srcdir)/tclstubs/libtclstubs.la
++      $(top_srcdir)/tclstubs/libtclstubs.la -lgd
  
  all-local: pkgIndex.tcl
  
---- graphviz-1.8.9/Makefile.am.orig    Thu Jul 11 17:27:01 2002
-+++ graphviz-1.8.9/Makefile.am Sat Aug 10 02:09:08 2002
-@@ -6,7 +6,7 @@
+--- graphviz-1.9/Makefile.am.orig      2003-01-27 21:11:38.000000000 +0100
++++ graphviz-1.9/Makefile.am   2003-05-15 20:27:31.000000000 +0200
+@@ -5,7 +5,7 @@
+ pkgindexdir = $(libdir)/@PACKAGE@
  pkgindex_DATA = pkgIndex.tcl
  
- # cdt must be built first to create ast_common.h which agraph uses
 -SUBDIRS = cdt agraph agutil dag doc pathplan graph gd dotneato \
 +SUBDIRS = cdt agraph agutil dag doc pathplan graph dotneato \
        dotty fdp geo graphs grid incr @X_SUBDIRS@ lneato ns shape \

diff --git a/graphviz.spec b/graphviz.spec
index 43327970c053d0e0e5a0f37e8a2ea142636d296e..67fd1a9427e064d3018f854f590f136b0ea93f17 100644 (file)
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -2,14 +2,15 @@
 # Conditional build:
 # _with_dynagraph - with dynagraph program (they say it requires gcc 3.1;
 #      it builds with 2.95.4, but doesn't seem to work - fstream problems)
+#      -- doesn't build now anyway in 1.9 (missing file?)
 # _without_system_gd - use included libgd instead of system-wide one
 #                      (needed if your libgd doesn't support GIF format)
 #
 Summary:       Graph Visualization Tools
 Summary(pl):   Narzêdzie do wizualizacji w postaci grafów
 Name:          graphviz
-Version:       1.8.9
-Release:       2
+Version:       1.9
+Release:       1
 License:       custom (AT&T)
 Group:         X11/Applications/Graphics
 Source0:       http://www.graphviz.org/pub/graphviz/%{name}-%{version}.tar.gz
@@ -24,17 +25,16 @@ BuildRequires:      bison
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.0
 BuildRequires: gawk
-%{!?_without_system_gd:BuildRequires:  gd-devel(gif) >= 2.0.1}
+%{!?_without_system_gd:BuildRequires:  gd-devel(gif) >= 2.0.9}
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: tcl-devel >= 8.3.0
 BuildRequires: zlib-devel
-%{!?_without_system_gd:Requires:       gd(gif) >= 2.0.1}
+%{!?_without_system_gd:Requires:       gd(gif) >= 2.0.9}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in barcharts).
@@ -83,7 +83,7 @@ Ten pakiet zawiera pliki nag
 
 %prep
 %setup -q
-if grep -q '^VERSION=1\.4d$' /usr/bin/libtool ; then
+if grep -q '^VERSION=1\.\(4[de]\|5\)$' /usr/bin/libtool ; then
 %patch0 -p1
 fi
 %{!?_without_system_gd:%patch1 -p1}