OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Jul-2007 12:15:22
Branch: HEAD Handle: 2007073111151901
Modified files:
openpkg-src/graphviz graphviz.patch graphviz.spec
Log:
fix building and cleanup packaging
Summary:
Revision Changes Path
1.9 +27 -0 openpkg-src/graphviz/graphviz.patch
1.69 +23 -3 openpkg-src/graphviz/graphviz.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 graphviz.patch
--- openpkg-src/graphviz/graphviz.patch 1 Aug 2005 11:06:45 -0000
1.8
+++ openpkg-src/graphviz/graphviz.patch 31 Jul 2007 10:15:19 -0000
1.9
@@ -22,3 +22,30 @@
#if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
#define SF_MAXDOUBLE MAXDOUBLE
#endif
+Index: contrib/diffimg/Makefile.in
+--- contrib/diffimg/Makefile.in.orig 2006-12-04 23:03:15 +0100
++++ contrib/diffimg/Makefile.in 2007-07-31 12:04:04 +0200
+@@ -54,8 +54,8 @@
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_diffimg_OBJECTS = diffimg.$(OBJEXT)
+ diffimg_OBJECTS = $(am_diffimg_OBJECTS)
[EMAIL PROTECTED]@diffimg_DEPENDENCIES = \
[EMAIL PROTECTED]@ $(top_builddir)/lib/gd/libgvgd_C.la
[EMAIL PROTECTED]@diffimg_DEPENDENCIES = \
[EMAIL PROTECTED]@ $(top_builddir)/lib/gd/libgvgd_C.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -367,9 +367,9 @@
+ target_alias = @target_alias@
+ AM_CPPFLAGS = @GD_INCLUDES@
+ diffimg_SOURCES = diffimg.c
[EMAIL PROTECTED]@diffimg_LDADD = @GD_LIBS@
[EMAIL PROTECTED]@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
[EMAIL PROTECTED]@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@
@MATH_LIBS@
[EMAIL PROTECTED]@diffimg_LDADD = @GD_LIBS@
[EMAIL PROTECTED]@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
[EMAIL PROTECTED]@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@
@MATH_LIBS@
+
+ GRAPH = "digraph G { hello -> world }"
+ CLEANFILES = *.png
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 graphviz.spec
--- openpkg-src/graphviz/graphviz.spec 1 Jan 2007 17:38:23 -0000
1.68
+++ openpkg-src/graphviz/graphviz.spec 31 Jul 2007 10:15:20 -0000
1.69
@@ -25,7 +25,7 @@
# package versions
%define V_graphviz 2.12
%define V_graphviz_perl_base 2.02
-%define V_graphviz_perl_data_structure 0.15
+%define V_graphviz_perl_data_structure 0.16
# package information
Name: graphviz
@@ -38,10 +38,10 @@
Group: Diagram
License: GPL
Version: %{V_graphviz}
-Release: 20061205
+Release: 20070731
# package options
-%option with_x11 yes
+%option with_x11 no
%option with_perl no
# list of sources
@@ -114,10 +114,25 @@
--with-pnglibdir=%{l_prefix}/lib \
--with-jpegincludedir=%{l_prefix}/include \
--with-jpeglibdir=%{l_prefix}/lib \
+ --without-mylibgd \
+ --with-libgd \
--with-gdincludedir=%{l_prefix}/include \
--with-gdlibdir=%{l_prefix}/lib \
--with-zincludedir=%{l_prefix}/include \
--with-zlibdir=%{l_prefix}/lib \
+ --without-gtk \
+ --disable-swig \
+ --disable-sharp \
+ --disable-guile \
+ --disable-io \
+ --disable-java \
+ --disable-lua \
+ --disable-ocaml \
+ --disable-perl \
+ --disable-php \
+ --disable-python \
+ --disable-ruby \
+ --disable-tcl \
--without-tclsh \
--without-wish \
%if "%{with_x11}" == "yes"
@@ -162,6 +177,11 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/graphviz/lefty
%endif
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ for lang in lua ocaml perl php python ruby sharp tcl guile io java; do
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/graphviz/$lang 2>/dev/null ||
true
+ done
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/dot_static \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/dot
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
