packages: graphviz/graphviz-bad-header.patch, graphviz/graphviz.spec, graph...
qboosh
qboosh at pld-linux.org
Sat Oct 23 08:40:18 CEST 2010
Author: qboosh Date: Sat Oct 23 06:40:18 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added ruby patch (fixes ruby.h detection)
- updated bad-header patch, actually apply it
- restored docs (argh, who "updated" this spec???)
---- Files affected:
packages/graphviz:
graphviz-bad-header.patch (1.2 -> 1.3) , graphviz.spec (1.119 -> 1.120) , graphviz-ruby.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/graphviz/graphviz-bad-header.patch
diff -u packages/graphviz/graphviz-bad-header.patch:1.2 packages/graphviz/graphviz-bad-header.patch:1.3
--- packages/graphviz/graphviz-bad-header.patch:1.2 Mon Sep 17 18:27:58 2007
+++ packages/graphviz/graphviz-bad-header.patch Sat Oct 23 08:40:13 2010
@@ -15,17 +15,6 @@
-#ifdef HAVE_CONFIG_H
+#if 0
+
/* true if point p is inside box b */
#define INSIDE(p,b) (BETWEEN((b).LL.x,(p).x,(b).UR.x) && BETWEEN((b).LL.y,(p).y,(b).UR.y))
- /* true if boxes b0 and b1 overlap */
---- graphviz-2.14.1-root-baggins/usr/include/graphviz/dot_builtins.c.orig 2007-09-17 18:25:45.000000000 +0200
-+++ graphviz-2.14.1-root-baggins/usr/include/graphviz/dot_builtins.c 2007-09-17 18:26:48.858885737 +0200
-@@ -14,7 +14,7 @@
- * AT&T Research, Florham Park NJ *
- **********************************************************/
-
--#ifdef HAVE_CONFIG_H
-+#if 0
- #include "config.h"
- #endif
-
================================================================
Index: packages/graphviz/graphviz.spec
diff -u packages/graphviz/graphviz.spec:1.119 packages/graphviz/graphviz.spec:1.120
--- packages/graphviz/graphviz.spec:1.119 Fri Oct 22 22:51:35 2010
+++ packages/graphviz/graphviz.spec Sat Oct 23 08:40:13 2010
@@ -49,6 +49,7 @@
Patch4: %{name}-ltdl.patch
Patch5: %{name}-lua51.patch
Patch6: %{name}-php_modules_dir.patch
+Patch7: %{name}-ruby.patch
URL: http://www.graphviz.org/
%{?with_devil:BuildRequires: DevIL-devel}
%{?with_r:BuildRequires: R}
@@ -320,6 +321,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# not used for anything
sed -i -e 's/libgnomeui-2.0/libgnomeui-disabled/' configure.ac
@@ -336,8 +338,6 @@
%{__automake}
CPPFLAGS="%{rpmcppflags}"
-CPPFLAGS="$CPPFLAGS -I%{_includedir}/ruby-1.9 -I%{_includedir}/ruby-1.9/%{_target}"
-
%if %{with java}
JAVA_HOME=%{java_home}
export JAVA_HOME
@@ -398,15 +398,16 @@
# created by %{_bindir}/dot -c
touch $RPM_BUILD_ROOT%{_libdir}/graphviz/config
-rm -f $RPM_BUILD_ROOT%{_libdir}/graphviz/*/lib*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/graphviz/libgvplugin_*.la
-
-#patch -p1 < %{PATCH2} || exit 1
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/graphviz/*/lib*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/graphviz/libgvplugin_*.la
rm -rf doc-html doc-pdf
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/html doc-html
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/pdf doc-pdf
+cd $RPM_BUILD_ROOT
+patch -p1 < %{PATCH2} || exit 1
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -427,10 +428,39 @@
%files
%defattr(644,root,root,755)
-#%doc AUTHORS COPYING ChangeLog NEWS doc/*.pdf
-%attr(755,root,root) %{_bindir}/*
-#%attr(755,root,root) %{_libdir}/libagraph.so.*.*.*
-#%attr(755,root,root) %ghost %{_libdir}/libagraph.so.4
+%doc AUTHORS COPYING ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/acyclic
+%attr(755,root,root) %{_bindir}/bcomps
+%attr(755,root,root) %{_bindir}/ccomps
+%attr(755,root,root) %{_bindir}/circo
+%attr(755,root,root) %{_bindir}/diffimg
+%attr(755,root,root) %{_bindir}/dijkstra
+%attr(755,root,root) %{_bindir}/dot
+%attr(755,root,root) %{_bindir}/dot2gxl
+%attr(755,root,root) %{_bindir}/dotty
+%attr(755,root,root) %{_bindir}/fdp
+%attr(755,root,root) %{_bindir}/gc
+%attr(755,root,root) %{_bindir}/gml2gv
+%attr(755,root,root) %{_bindir}/gv2gxl
+%attr(755,root,root) %{_bindir}/gvcolor
+%attr(755,root,root) %{_bindir}/gvgen
+%attr(755,root,root) %{_bindir}/gvpack
+%attr(755,root,root) %{_bindir}/gvpr
+%attr(755,root,root) %{_bindir}/gxl2dot
+%attr(755,root,root) %{_bindir}/gxl2gv
+%attr(755,root,root) %{_bindir}/lefty
+%attr(755,root,root) %{_bindir}/lneato
+%attr(755,root,root) %{_bindir}/mm2gv
+%attr(755,root,root) %{_bindir}/neato
+%attr(755,root,root) %{_bindir}/nop
+%attr(755,root,root) %{_bindir}/osage
+%attr(755,root,root) %{_bindir}/prune
+%attr(755,root,root) %{_bindir}/sccmap
+%attr(755,root,root) %{_bindir}/sfdp
+%attr(755,root,root) %{_bindir}/tred
+%attr(755,root,root) %{_bindir}/twopi
+%attr(755,root,root) %{_bindir}/unflatten
+%attr(755,root,root) %{_bindir}/vimdot
%attr(755,root,root) %{_libdir}/libcdt.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcdt.so.4
%attr(755,root,root) %{_libdir}/libcgraph.so.*.*.*
@@ -454,21 +484,48 @@
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_dot_layout.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gd.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gdk_pixbuf.so*
+%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gs.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_gtk.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_neato_layout.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_pango.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_rsvg.so*
%attr(755,root,root) %{_libdir}/graphviz/libgvplugin_xlib.so*
-# what about the rest of *.la?
%dir %{_datadir}/graphviz
%dir %{_datadir}/graphviz/demo
%{_datadir}/graphviz/lefty
-%{_mandir}/man1/*
+%{_mandir}/man1/acyclic.1*
+%{_mandir}/man1/bcomps.1*
+%{_mandir}/man1/ccomps.1*
+%{_mandir}/man1/circo.1*
+%{_mandir}/man1/dijkstra.1*
+%{_mandir}/man1/dot.1*
+%{_mandir}/man1/dotty.1*
+%{_mandir}/man1/fdp.1*
+%{_mandir}/man1/gc.1*
+%{_mandir}/man1/gml2gv.1*
+%{_mandir}/man1/gv2gxl.1*
+%{_mandir}/man1/gvcolor.1*
+%{_mandir}/man1/gvgen.1*
+%{_mandir}/man1/gvpack.1*
+%{_mandir}/man1/gvpr.1*
+%{_mandir}/man1/gxl2gv.1*
+%{_mandir}/man1/lefty.1*
+%{_mandir}/man1/lneato.1*
+%{_mandir}/man1/mm2gv.1*
+%{_mandir}/man1/neato.1*
+%{_mandir}/man1/nop.1*
+%{_mandir}/man1/osage.1*
+%{_mandir}/man1/prune.1*
+%{_mandir}/man1/sccmap.1*
+%{_mandir}/man1/sfdp.1*
+%{_mandir}/man1/smyrna.1*
+%{_mandir}/man1/tred.1*
+%{_mandir}/man1/twopi.1*
+%{_mandir}/man1/unflatten.1*
%{_mandir}/man7/graphviz.7*
%files devel
%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libagraph.so
%attr(755,root,root) %{_libdir}/libcdt.so
%attr(755,root,root) %{_libdir}/libcgraph.so
%attr(755,root,root) %{_libdir}/libgraph.so
@@ -476,7 +533,6 @@
%attr(755,root,root) %{_libdir}/libgvpr.so
%attr(755,root,root) %{_libdir}/libpathplan.so
%attr(755,root,root) %{_libdir}/libxdot.so
-#%{_libdir}/libagraph.la
%{_libdir}/libcdt.la
%{_libdir}/libcgraph.la
%{_libdir}/libgraph.la
@@ -484,7 +540,6 @@
%{_libdir}/libgvpr.la
%{_libdir}/libpathplan.la
%{_libdir}/libxdot.la
-#%{_pkgconfigdir}/libagraph.pc
%{_pkgconfigdir}/libcdt.pc
%{_pkgconfigdir}/libcgraph.pc
%{_pkgconfigdir}/libgraph.pc
@@ -524,7 +579,7 @@
%defattr(644,root,root,755)
%dir %{_libdir}/graphviz/guile
%attr(755,root,root) %{_libdir}/graphviz/guile/libgv_guile.so
-%{_mandir}/man3/gv_guile.*
+%{_mandir}/man3/gv_guile.3*
%endif
%if %{with java}
@@ -533,7 +588,7 @@
%dir %{_libdir}/graphviz/java
%attr(755,root,root) %{_libdir}/graphviz/java/libgv_java.so
%{_libdir}/graphviz/java/*.java
-%{_mandir}/man3/gv_java.*
+%{_mandir}/man3/gv_java.3*
%endif
%if %{with lua}
@@ -544,7 +599,7 @@
%attr(755,root,root) %{_libdir}/graphviz/lua/gv.so
%attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.lua
%attr(755,root,root) %{_libdir}/lua/gv.so
-%{_mandir}/man3/gv_lua.*
+%{_mandir}/man3/gv_lua.3*
%endif
%if %{with ocaml}
@@ -556,7 +611,7 @@
%{_libdir}/graphviz/ocaml/gv.a
%{_libdir}/graphviz/ocaml/gv.cm*
%{_libdir}/graphviz/ocaml/gv.ml*
-%{_mandir}/man3/gv_ocaml.*
+%{_mandir}/man3/gv_ocaml.3*
%endif
%if %{with perl}
@@ -569,7 +624,7 @@
%attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.pl
%attr(755,root,root) %{perl_vendorarch}/gv.so
%{perl_vendorarch}/gv.pm
-%{_mandir}/man3/gv_perl.*
+%{_mandir}/man3/gv_perl.3*
%endif
%if %{with php}
@@ -578,7 +633,7 @@
%attr(755,root,root) %{php_extensiondir}/gv.so
%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{name}.ini
%{php_data_dir}/gv.php
-%{_mandir}/man3/gv_php.*
+%{_mandir}/man3/gv_php.3*
%{_examplesdir}/php-%{name}-%{version}
%endif
@@ -592,7 +647,7 @@
%attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.py
%attr(755,root,root) %{py_sitedir}/_gv.so
%{py_sitedir}/gv.py
-%{_mandir}/man3/gv_python.*
+%{_mandir}/man3/gv_python.3*
%endif
%if %{with ruby}
@@ -603,7 +658,7 @@
%attr(755,root,root) %{_libdir}/graphviz/ruby/gv.so
%attr(755,root,root) %{_datadir}/graphviz/demo/modgraph.rb
%{ruby_sitearchdir}/gv.so
-%{_mandir}/man3/gv_ruby.*
+%{_mandir}/man3/gv_ruby.3*
%endif
%if %{with dotnet}
@@ -612,7 +667,7 @@
%dir %{_libdir}/graphviz/sharp
%attr(755,root,root) %{_libdir}/graphviz/sharp/libgv_sharp.so
%{_libdir}/graphviz/sharp/*.cs
-%{_mandir}/man3/gv_sharp.*
+%{_mandir}/man3/gv_sharp.3*
%endif
%if %{with tcl}
@@ -626,8 +681,8 @@
%attr(755,root,root) %{_libdir}/graphviz/tcl/libtclplan.so*
%attr(755,root,root) %{_libdir}/graphviz/tcl/libtkspline.so*
%{_libdir}/graphviz/tcl/pkgIndex.tcl
-%{_libdir}/tcl*/*
-%{_mandir}/man3/gv_tcl.*
+%{_libdir}/tcl*/graphviz
+%{_mandir}/man3/gv_tcl.3*
%{_mandir}/man3/gdtclft.3tcl*
%{_mandir}/man3/pathplan.3*
%{_mandir}/man3/tcldot.3tcl*
@@ -649,7 +704,7 @@
%dir %{_libdir}/%{name}/R
%attr(755,root,root) %{_libdir}/%{name}/R/gv.so
%attr(755,root,root) %{_libdir}/%{name}/R/libgv_R.so
-%{_mandir}/man3/gv_r.*
+%{_mandir}/man3/gv_r.3*
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -658,6 +713,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.120 2010/10/23 06:40:13 qboosh
+- added ruby patch (fixes ruby.h detection)
+- updated bad-header patch, actually apply it
+- restored docs (argh, who "updated" this spec???)
+
Revision 1.119 2010/10/22 20:51:35 qboosh
- added ltdl patch (resolved conflict with lt_preloaded_symbols mangling in <ltdl.h>)
================================================================
Index: packages/graphviz/graphviz-ruby.patch
diff -u /dev/null packages/graphviz/graphviz-ruby.patch:1.1
--- /dev/null Sat Oct 23 08:40:18 2010
+++ packages/graphviz/graphviz-ruby.patch Sat Oct 23 08:40:13 2010
@@ -0,0 +1,28 @@
+--- graphviz-2.26.3/configure.ac.orig 2010-10-22 09:01:47.799741043 +0200
++++ graphviz-2.26.3/configure.ac 2010-10-22 23:17:41.319743558 +0200
+@@ -1404,10 +1404,10 @@
+ if test "x$RUBY" = "x"; then
+ use_ruby="No (ruby not available)"
+ else
+- RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
++ RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES` -I`$RUBY $srcdir/config/config_ruby.rb archincludes`"
+ # hack for powerpc-darwin8 (10.4)
+ RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
+- RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
++ RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` $($RUBY -rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]")"
+ RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
+--- graphviz-2.26.3/config/config_ruby.rb.orig 2005-03-26 19:49:00.000000000 +0100
++++ graphviz-2.26.3/config/config_ruby.rb 2010-10-22 23:22:53.627734339 +0200
+@@ -5,7 +5,9 @@
+
+ case ARGV[0]
+ when "INCLUDES"
+- puts Config::expand(CONFIG["archdir"])
++ puts Config::expand(CONFIG["rubyhdrdir"])
++when "archincludes"
++ puts Config::expand(CONFIG["rubyhdrdir"]+"/"+CONFIG["arch"])
+ when "lib"
+ puts Config::expand(CONFIG["libdir"])
+ when "archsitelib"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz-bad-header.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz.spec?r1=1.119&r2=1.120&f=u
More information about the pld-cvs-commit
mailing list