[packages/graphviz] - updated to 2.34.0 - updated ruby,go,format,visio patches - removed obsolete guile,perl patches - e

qboosh qboosh at pld-linux.org
Sun Nov 10 18:36:58 CET 2013 

commit c006c45c5569048e73b53620e2f661b6d80bce42
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 10 18:37:21 2013 +0100

    - updated to 2.34.0
    - updated ruby,go,format,visio patches
    - removed obsolete guile,perl patches
    - enabled go support by default (where available)
    - package poppler plugin and mingle utility

 graphviz-format.patch | 11 ---------
 graphviz-go.patch     | 21 +++++++++++++----
 graphviz-guile.patch  | 11 ---------
 graphviz-perl.patch   | 14 ------------
 graphviz-ruby.patch   | 10 ++++----
 graphviz-visio.patch  | 22 ------------------
 graphviz.spec         | 63 ++++++++++++++++++++++++++++++++++-----------------
 7 files changed, 63 insertions(+), 89 deletions(-)
---
diff --git a/graphviz.spec b/graphviz.spec
index f1af471..92e6118 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,11 +1,11 @@
 # TODO
 # - %{_libdir}/graphviz/config is not FHS friendly path as config
-# - io language binding: io-graphviz
-# - some plugin subpackages? (libgvplugin_*: gs=ghostscript, gtk, lasi, ming, visio, webp)
+# - io language binding (waiting for swig support)
+# - some plugin subpackages? (libgvplugin_*: gs=ghostscript, gtk, lasi, ming, poppler, visio, webp)
 #
 # Conditional build:
 %bcond_without	dotnet		# don't build C# bindings
-%bcond_with	golang		# don't build Go bindings
+%bcond_without	golang		# don't build Go bindings
 %bcond_without	java		# don't build Java bindings
 %bcond_without	ocaml		# don't build ocaml bindings
 %bcond_without	php		# don't build php bindings
@@ -15,7 +15,7 @@
 %bcond_without	lua		# don't build lua bindings
 %bcond_without	r		# don't build R bindings
 %bcond_without	python		# don't build python bindings
-%bcond_with	io		# don't build io language bindings
+%bcond_with	io		# build io language bindings (needs swig support)
 %bcond_without	guile		# don't build guile bindings
 %bcond_without	ming		# don't build ming support
 %bcond_without	devil		# don't build devil plugin
@@ -40,12 +40,12 @@
 Summary:	Graph Visualization Tools
 Summary(pl.UTF-8):	Narzędzie do wizualizacji w postaci grafów
 Name:		graphviz
-Version:	2.30.1
-Release:	5
+Version:	2.34.0
+Release:	1
 License:	CPL v1.0
 Group:		X11/Applications/Graphics
 Source0:	http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-# Source0-md5:	8130785a8f1fb8a57f6b839b617e85fa
+# Source0-md5:	a8a54f8abac5bcdafd9a568e85a086d6
 Patch0:		%{name}-fontpath.patch
 Patch1:		%{name}-tk.patch
 Patch2:		%{name}-bad-header.patch
@@ -54,16 +54,15 @@ Patch4:		%{name}-ltdl.patch
 Patch5:		%{name}-go.patch
 Patch6:		%{name}-php_modules_dir.patch
 Patch7:		%{name}-ruby.patch
-Patch8:		%{name}-guile.patch
 Patch9:		%{name}-libgraph.patch
 Patch10:	%{name}-ming.patch
 Patch11:	%{name}-visio.patch
 Patch12:	%{name}-webp.patch
 Patch13:	%{name}-format.patch
-Patch14:	%{name}-perl.patch
 URL:		http://www.graphviz.org/
 %{?with_devil:BuildRequires:	DevIL-devel}
 %{?with_r:BuildRequires:	R}
+BuildRequires:	ann-devel
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
 BuildRequires:	bison
@@ -109,11 +108,12 @@ BuildRequires:	php-devel >= 3:5.0.0
 BuildRequires:	php-program >= 4:5.0
 %endif
 BuildRequires:	pkgconfig
+BuildRequires:	poppler-glib-devel
 %{?with_python:BuildRequires:	python-devel}
 %{?with_perl:BuildRequires:	rpm-perlprov}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	rpmbuild(macros) >= 1.519
-%{?with_ruby:BuildRequires:	ruby-devel}
+%{?with_ruby:BuildRequires:	ruby-devel >= 1.9}
 BuildRequires:	sed >= 4.0
 # swig-csharp,swig-go,swig-java,swig-lua,swig-ocaml in main swig
 # swig-io ???
@@ -250,6 +250,19 @@ Go binding for graphviz.
 %description -n golang-%{name} -l pl.UTF-8
 Wiązania języka Go dla graphviza.
 
+%package -n io-%{name}
+Summary:	Io binding for graphviz
+Summary(pl.UTF-8):	Wiązania języka Io dla graphviza
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	io
+
+%description -n io-%{name}
+Io binding for graphviz.
+
+%description -n io-%{name} -l pl.UTF-8
+Wiązania języka Io dla graphviza.
+
 %package -n guile-%{name}
 Summary:	Guile binding for graphviz
 Summary(pl.UTF-8):	Wiązania Guile dla graphviza
@@ -404,13 +417,11 @@ Wiązania graphviza dla języka R.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 %{__sed} '1s@/usr/bin/lua$@/usr/bin/lua51@' -i tclpkg/gv/demo/modgraph.lua
 
@@ -438,6 +449,7 @@ export CPPFLAGS
 	lua_suffix=51 \
 	%{!?with_devil:--disable-devil} \
 	%{?with_golang:--enable-go} \
+	%{?with_io:--enable-io} \
 	%{!?with_java:--disable-java} \
 	--disable-ltdl-install \
 	%{!?with_lua:--disable-lua} \
@@ -457,7 +469,13 @@ export CPPFLAGS
 	--with-visio \
 	--with-webp
 
-%{__make}
+%{__make} \
+%ifarch %{ix86} %{arm}
+	SWIG_GO_OPT="-intgosize 32"
+%endif
+%ifarch %{x8664}
+	SWIG_GO_OPT="-intgosize 64"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -550,6 +568,7 @@ fi
 %attr(755,root,root) %{_bindir}/gxl2gv
 %attr(755,root,root) %{_bindir}/lefty
 %attr(755,root,root) %{_bindir}/lneato
+%attr(755,root,root) %{_bindir}/mingle
 %attr(755,root,root) %{_bindir}/mm2gv
 %attr(755,root,root) %{_bindir}/neato
 %attr(755,root,root) %{_bindir}/nop
@@ -593,6 +612,7 @@ fi
 %endif
 %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_poppler.so*
 %attr(755,root,root) %{_libdir}/graphviz/libgvplugin_rsvg.so*
 %attr(755,root,root) %{_libdir}/graphviz/libgvplugin_visio.so*
 %attr(755,root,root) %{_libdir}/graphviz/libgvplugin_webp.so*
@@ -629,6 +649,7 @@ fi
 %{_mandir}/man1/gxl2gv.1*
 %{_mandir}/man1/lefty.1*
 %{_mandir}/man1/lneato.1*
+%{_mandir}/man1/mingle.1*
 %{_mandir}/man1/mm2gv.1*
 %{_mandir}/man1/neato.1*
 %{_mandir}/man1/nop.1*
@@ -711,14 +732,6 @@ fi
 %{_mandir}/man3/gv_go.3*
 %endif
 
-%if 0
-%files -n io-%{name}
-%defattr(644,root,root,755)
-%dir %{_libdir}/graphviz/io
-%attr(755,root,root) %{_libdir}/graphviz/io/libgv_io.so*
-%{_mandir}/mann/gv_io.n*
-%endif
-
 %if %{with guile}
 %files -n guile-%{name}
 %defattr(644,root,root,755)
@@ -727,6 +740,14 @@ fi
 %{_mandir}/man3/gv_guile.3*
 %endif
 
+%if %{with io}
+%files -n io-%{name}
+%defattr(644,root,root,755)
+%dir %{_libdir}/graphviz/io
+%attr(755,root,root) %{_libdir}/graphviz/io/libgv_io.so*
+%{_mandir}/mann/gv_io.n*
+%endif
+
 %if %{with java}
 %files -n java-%{name}
 %defattr(644,root,root,755)
diff --git a/graphviz-format.patch b/graphviz-format.patch
index ae099d1..b7b8b9a 100644
--- a/graphviz-format.patch
+++ b/graphviz-format.patch
@@ -1,14 +1,3 @@
---- graphviz-2.30.0/cmd/smyrna/main.c.orig	2013-01-14 04:11:21.000000000 +0100
-+++ graphviz-2.30.0/cmd/smyrna/main.c	2013-01-24 10:53:20.204392295 +0100
-@@ -94,7 +94,7 @@
- 
- static void usage(int v)
- {
--    printf(useString);
-+    fputs(useString, stdout);
-     exit(v);
- }
- 
 --- graphviz-2.30.0/cmd/smyrna/gui/gui.c.orig	2013-01-14 04:11:21.000000000 +0100
 +++ graphviz-2.30.0/cmd/smyrna/gui/gui.c	2013-01-24 12:31:24.181987670 +0100
 @@ -379,7 +379,7 @@ void show_gui_warning(char *str)
diff --git a/graphviz-go.patch b/graphviz-go.patch
index c8a3468..100198a 100644
--- a/graphviz-go.patch
+++ b/graphviz-go.patch
@@ -1,11 +1,22 @@
---- graphviz-2.30.1/configure.ac.orig	2013-03-30 20:08:59.771231790 +0100
-+++ graphviz-2.30.1/configure.ac	2013-03-31 10:33:14.260226012 +0200
-@@ -643,7 +643,7 @@
-     if test `$SWIG -help 2>&1 | $EGREP -c '\-go* *- Generate'` == 0 ; then
+--- graphviz-2.34.0/configure.ac.orig	2013-11-10 15:05:37.073591970 +0100
++++ graphviz-2.34.0/configure.ac	2013-11-10 15:07:22.393587281 +0100
+@@ -648,7 +648,7 @@
+     if test `$SWIG -help 2>&1 | $EGREP -c '\-go* *- Generate'` = 0 ; then
        use_go="No (swig does not support -go option)"
      else
 -      AC_CHECK_PROG(GO,6g,8g)
 +      AC_CHECK_PROGS(GO,[6g 8g 5g])
-       if test "x$GO" == "x"; then
+       if test "x$GO" = "x"; then
          use_go="No (GO compiler not available)"
        else
+--- graphviz-2.34.0/tclpkg/gv/Makefile.am.orig	2013-09-07 03:07:52.000000000 +0200
++++ graphviz-2.34.0/tclpkg/gv/Makefile.am	2013-11-10 16:08:46.400099613 +0100
+@@ -48,7 +48,7 @@
+ libgv_go_la_CPPFLAGS = $(BASECPPFLAGS) $(GO_INCLUDES)
+ # $(GO_data): gv_go.cpp
+ gv_go.cpp: gv.i
+-	$(SWIG) -c++ -go -o gv_go.cpp $(srcdir)/gv.i
++	$(SWIG) -c++ -go -o gv_go.cpp $(SWIG_GO_OPT) $(srcdir)/gv.i
+ 
+ pkgguiledir = $(pkglibdir)/guile
+ GUILE_data = 
diff --git a/graphviz-guile.patch b/graphviz-guile.patch
deleted file mode 100644
index 14a5328..0000000
--- a/graphviz-guile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.30.0/configure.ac.orig	2013-01-19 20:49:15.654106463 +0100
-+++ graphviz-2.30.0/configure.ac	2013-01-19 22:37:00.717305043 +0100
-@@ -710,7 +710,7 @@
-           GUILE_LIBS=
- 	  # don't die if PKG_CHECK_MODULES not available - el4, el5
-           PKG_CHECK_MODULES([GUILE],
--		[guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"],
-+		[guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"],
- 		GUILE_INCLUDES="$GUILE_CFLAGS",
- 		false)
-           ac_save_CFLAGS="$CFLAGS"
diff --git a/graphviz-perl.patch b/graphviz-perl.patch
deleted file mode 100644
index e876268..0000000
--- a/graphviz-perl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- graphviz-2.30.1/config/config_perl.pl.orig	2013-06-12 19:42:15.968885559 +0200
-+++ graphviz-2.30.1/config/config_perl.pl	2013-06-12 19:42:35.045752403 +0200
-@@ -11,10 +11,7 @@
- 	print "-I$archlib/CORE";
- }
- if ($ARGV[0] eq "PERL_INSTALL_DIR") {
--
--	my $d;
--
--	foreach $d qw(installvendorarch vendorarch installsitearch sitearch) {
-+	foreach my $d (qw(installvendorarch vendorarch installsitearch sitearch)) {
- 		if (exists($Config{$d}) and defined($Config{$d}) and
- 			($Config{$d} ne '') ) {
- 			print "$Config{$d}";
diff --git a/graphviz-ruby.patch b/graphviz-ruby.patch
index 259bb6a..73816a0 100644
--- a/graphviz-ruby.patch
+++ b/graphviz-ruby.patch
@@ -9,16 +9,16 @@
              RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
  	    if test "x$RUBY_INSTALL_DIR" == "x"; then
  	  	  RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
---- graphviz-2.30.0/config/config_ruby.rb.orig	2013-01-19 19:53:28.134176235 +0100
-+++ graphviz-2.30.0/config/config_ruby.rb	2013-01-19 19:58:10.874170341 +0100
+--- graphviz-2.34.0/config/config_ruby.rb.orig	2013-11-10 15:08:02.653585861 +0100
++++ graphviz-2.34.0/config/config_ruby.rb	2013-11-10 15:08:47.280250638 +0100
 @@ -8,6 +8,10 @@
-     puts Config::expand(CONFIG["archdir"])
+     puts RbConfig::expand(CONFIG["archdir"])
  when "lib"
-     puts Config::expand(CONFIG["libdir"])
+     puts RbConfig::expand(CONFIG["libdir"])
 +when "includes"
 +    puts Config::expand(CONFIG["rubyhdrdir"])
 +when "archincludes"
 +    puts Config::expand(CONFIG["rubyhdrdir"]+"/"+CONFIG["arch"])
  when "vendorarchdir"
-     puts Config::expand(CONFIG["vendorarchdir"])
+     puts RbConfig::expand(CONFIG["vendorarchdir"])
  when "sitearchdir"
diff --git a/graphviz-visio.patch b/graphviz-visio.patch
index 56a9872..6101cac 100644
--- a/graphviz-visio.patch
+++ b/graphviz-visio.patch
@@ -18,25 +18,3 @@
  #endif
  
  extern "C" char *xml_string(char* str);
---- graphviz-2.30.0/lib/cdt/cdt.h.orig	2013-01-14 04:11:21.000000000 +0100
-+++ graphviz-2.30.0/lib/cdt/cdt.h	2013-01-20 17:35:24.789214707 +0100
-@@ -17,6 +17,7 @@
- #endif
- 
- #include <stddef.h>	/* size_t */
-+#include <string.h>	/* memcmp, strcmp */
- 
- #ifndef _BEGIN_EXTERNS_
- #define _BEGIN_EXTERNS_
-@@ -238,11 +239,6 @@
- extern int		dtstat _ARG_((Dt_t*, Dtstat_t*, int));
- extern unsigned int	dtstrhash _ARG_((unsigned int, Void_t*, int));
- 
--#if !_PACKAGE_ast
--extern int		memcmp _ARG_((const Void_t*, const Void_t*, size_t));
--extern int		strcmp _ARG_((const char*, const char*));
--#endif
--
- #undef extern
- _END_EXTERNS_
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/c006c45c5569048e73b53620e2f661b6d80bce42

More information about the pld-cvs-commit mailing list