commit f11c354ae6846eb70d041d13c0701d065e8e8455
Author: Jan Rękorajski <[email protected]>
Date: Wed Aug 8 11:12:48 2012 +0200
Fix incompatibilities with latest automake
graphviz-am.patch | 31 +++++++++++++++++++++++++++++++
graphviz.spec | 2 ++
2 files changed, 33 insertions(+)
---
diff --git a/graphviz-am.patch b/graphviz-am.patch
new file mode 100644
index 0000000..e0349ee
--- /dev/null
+++ b/graphviz-am.patch
@@ -0,0 +1,31 @@
+--- graphviz-2.28.0/plugin/ming/Makefile.am 2009-06-03 03:10:57.000000000
+0200
++++ graphviz/plugin/ming/Makefile.am 2012-08-08 11:06:32.155715237 +0200
+@@ -1,6 +1,8 @@
+ # $Id: Makefile.am,v 1.16 2009/06/03 01:10:57 ellson Exp $ $Revision: 1.16 $
+ ## Process this file with automake to produce Makefile.in
+
++pkgfontdir = ${pkgdatadir}/font
++
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/lib/common \
+@@ -17,7 +19,7 @@
+ else
+ pkglib_LTLIBRARIES = libgvplugin_ming.la
+ endif
+-pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
++pkgfont_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
+ endif
+
+ libgvplugin_ming_C_la_SOURCES = \
+--- graphviz-2.28.0/tclpkg/gv/Makefile.am 2011-03-28 20:15:56.000000000
+0200
++++ graphviz/tclpkg/gv/Makefile.am 2012-08-08 11:06:32.805715217 +0200
+@@ -253,7 +259,7 @@
+ gv_tcl.cpp: gv.i
+ $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
+
+-pkginclude_DATA = gv.i gv.cpp
++pkginclude_HEADERS = gv.i gv.cpp
+ pkglib_LTLIBRARIES =
+ man_MANS =
+ pdf_DATA =
diff --git a/graphviz.spec b/graphviz.spec
index d01650e..f5cf1ca 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -51,6 +51,7 @@ Patch5: %{name}-lua51.patch
Patch6: %{name}-php_modules_dir.patch
Patch7: %{name}-ruby.patch
Patch8: %{name}-guile.patch
+Patch9: %{name}-am.patch
URL: http://www.graphviz.org/
%{?with_devil:BuildRequires: DevIL-devel}
%{?with_r:BuildRequires: R}
@@ -326,6 +327,7 @@ graphviz bindings for R language.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%{__sed} '1s@/usr/bin/lua$@/usr/bin/lua51@' -i tclpkg/gv/demo/modgraph.lua
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
