OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Aug-2005 13:06:45
Branch: HEAD Handle: 2005080112064500
Modified files:
openpkg-src/graphviz graphviz.patch graphviz.spec
Log:
upgrading package: graphviz 2.2.1 -> 2.4
Summary:
Revision Changes Path
1.8 +3 -74 openpkg-src/graphviz/graphviz.patch
1.57 +2 -4 openpkg-src/graphviz/graphviz.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 graphviz.patch
--- openpkg-src/graphviz/graphviz.patch 20 Jan 2005 15:51:35 -0000
1.7
+++ openpkg-src/graphviz/graphviz.patch 1 Aug 2005 11:06:45 -0000
1.8
@@ -1,6 +1,6 @@
-Index: tools/sfio/sfhdr.h
---- tools/sfio/sfhdr.h.orig Fri Apr 27 04:17:42 2001
-+++ tools/sfio/sfhdr.h Tue Feb 18 19:26:37 2003
+Index: lib/sfio/sfhdr.h
+--- lib/sfio/sfhdr.h.orig Fri Apr 27 04:17:42 2001
++++ lib/sfio/sfhdr.h Tue Feb 18 19:26:37 2003
@@ -143,6 +143,10 @@
#include <errno.h>
#include <ctype.h>
@@ -22,74 +22,3 @@
#if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
#define SF_MAXDOUBLE MAXDOUBLE
#endif
-Index: lefty/common.h
---- lefty/common.h.orig 2004-08-25 00:52:28 +0200
-+++ lefty/common.h 2004-08-31 10:57:50 +0200
-@@ -69,12 +69,15 @@
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
--#ifdef HAVE_LIMITS_H
--#include <limits.h>
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
- #endif
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_LIMITS_H
-+#include <limits.h>
-+#endif
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif
-Index: Makefile.in
---- Makefile.in.orig 2004-08-31 00:31:22 +0200
-+++ Makefile.in 2004-08-31 12:32:12 +0200
-@@ -288,8 +288,7 @@
- txt_DATA = $(txt)
- SUBDIRS = cdt agraph agutil doc pathplan graph gd dotneato \
- dotty graphs lefty lneato ns \
-- tclstubs tclhandle gdtclft tcldot tclpathplan \
-- tkstubs tkspline tools contrib dynagraph
-+ tools contrib dynagraph
-
- EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec graphviz.cvt \
- autogen.sh config/depcomp config/config.rpath ast_common.h.in \
-Index: dotneato/dotgen/Makefile.in
---- dotneato/dotgen/Makefile.in.orig 2004-12-11 21:43:25 +0100
-+++ dotneato/dotgen/Makefile.in 2004-12-14 12:41:39 +0100
-@@ -299,7 +300,8 @@
-
- libdotgen_la_LIBADD = \
- $(top_builddir)/pathplan/libpathplan.la \
-- $(top_builddir)/graph/libgraph.la
-+ $(top_builddir)/graph/libgraph.la \
-+ $(top_builddir)/dotneato/common/libcommon.la
-
- EXTRA_DIST = Makefile.old
- all: all-am
-Index: dotneato/neatogen/Makefile.in
---- dotneato/neatogen/Makefile.in.orig 2004-12-11 21:43:28 +0100
-+++ dotneato/neatogen/Makefile.in 2004-12-14 12:50:39 +0100
-@@ -312,7 +312,8 @@
- libneatogen_la_LIBADD = \
- $(top_builddir)/dotneato/pack/libpack.la \
- $(top_builddir)/pathplan/libpathplan.la \
-- $(top_builddir)/graph/libgraph.la
-+ $(top_builddir)/graph/libgraph.la \
-+ $(top_builddir)/dotneato/common/libcommon.la
-
- EXTRA_DIST = Makefile.old
- all: all-am
-Index: dotneato/common/Makefile.in
---- dotneato/common/Makefile.in.orig 2005-01-20 16:46:13 +0100
-+++ dotneato/common/Makefile.in 2005-01-20 16:46:23 +0100
-@@ -294,6 +294,7 @@
- -I$(top_srcdir)/pathplan \
- -I$(top_srcdir)/graph \
- -I$(top_srcdir)/cdt \
-+ -I$(top_srcdir)/gd \
- @GD_INCLUDES@ @EXPAT_INCLUDES@ @LIBSVG_CAIRO_CFLAGS@ @Z_INCLUDES@
-
- pkginclude_HEADERS = const.h globals.h htmllex.h htmltable.h macros.h \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.spec
============================================================================
$ cvs diff -u -r1.56 -r1.57 graphviz.spec
--- openpkg-src/graphviz/graphviz.spec 8 Apr 2005 06:20:39 -0000
1.56
+++ openpkg-src/graphviz/graphviz.spec 1 Aug 2005 11:06:45 -0000
1.57
@@ -23,7 +23,7 @@
##
# package versions
-%define V_graphviz 2.2.1
+%define V_graphviz 2.4
%define V_graphviz_perl_base 2.02
%define V_graphviz_perl_data_structure 0.12
@@ -38,7 +38,7 @@
Group: Graphics
License: GPL
Version: %{V_graphviz}
-Release: 20050408
+Release: 20050801
# package options
%option with_x11 yes
@@ -156,8 +156,6 @@
%endif
# post-adjust installation
- mv $RPM_BUILD_ROOT%{l_prefix}/lib/graphviz/pkgconfig \
- $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/graphviz/*.tcl
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/graphviz/doc/html
%if "%{with_x11}" != "yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
