- updated to 2.30.1

- updated ming,ruby patches
- removed obsolete lua51 patch
- added go patch, package golang binding

diff --git a/graphviz-go.patch b/graphviz-go.patch
new file mode 100644 (file)
index 0000000..c8a3468
--- /dev/null
+++ b/graphviz-go.patch
@@ -0,0 +1,11 @@
+--- 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
+       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
+         use_go="No (GO compiler not available)"
+       else

diff --git a/graphviz-lua51.patch b/graphviz-lua51.patch
deleted file mode 100644 (file)
index cec6dc0..0000000
--- a/graphviz-lua51.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.20.3/configure.ac.orig  2008-10-14 17:15:51.463774247 +0200
-+++ graphviz-2.20.3/configure.ac       2008-10-14 17:16:28.461231498 +0200
-@@ -721,7 +721,7 @@
-     if test `$SWIG -help 2>&1 | $GREP -c '\-lua *- Generate'` = 0; then
-       use_lua="No (swig does not support -lua option)"
-     else
--      AC_CHECK_PROG(LUA,lua,lua)
-+      AC_CHECK_PROG(LUA,lua51,lua)
-       if test "x$LUA" = "x"; then
-         use_lua="No (lua not available)"
-       else

diff --git a/graphviz-ming.patch b/graphviz-ming.patch
index 1fc20177be9efc29544aedbf95b88c13f068b1ab..958c28879e7fe1a79bfa9ab4734d48f3c25e53a7 100644 (file)
--- a/graphviz-ming.patch
+++ b/graphviz-ming.patch
@@ -1,14 +1,5 @@
 --- graphviz-2.30.0/plugin/ming/Makefile.am.orig       2013-01-14 04:11:21.000000000 +0100
 +++ graphviz-2.30.0/plugin/ming/Makefile.am    2013-01-20 17:23:58.735895674 +0100
-@@ -8,7 +8,7 @@
-       -I$(top_srcdir)/lib/common \
-       -I$(top_srcdir)/lib/pathplan \
-       -I$(top_srcdir)/lib/gvc \
--      -I$(top_srcdir)/lib/graph \
-+      -I$(top_srcdir)/lib/cgraph \
-       -I$(top_srcdir)/lib/cdt \
-       $(MING_CFLAGS)
- 
 @@ -28,7 +28,7 @@
  
  libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@

diff --git a/graphviz-ruby.patch b/graphviz-ruby.patch
index 9a9983bbda5d03577ed6b4b238f882d5f6648324..259bb6a7123a2d3fce947744fe49dd4d40bf5189 100644 (file)
--- a/graphviz-ruby.patch
+++ b/graphviz-ruby.patch
@@ -1,20 +1,14 @@
---- graphviz-2.30.0/configure.ac.orig  2013-01-19 19:53:28.130842902 +0100
-+++ graphviz-2.30.0/configure.ac       2013-01-19 19:56:44.934172133 +0100
-@@ -1549,12 +1549,12 @@
-         if test "x$RUBY" = "x"; then
-         use_ruby="No (ruby not available)"
-         else
--          RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
-+          RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir` "
-         # hack for powerpc-darwin8 (10.4)
-         if test "x$DARWIN" = "xyes"; then
-           RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
-         fi
--          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 vendorarchdir`"
-         if test "x$RUBY_INSTALL_DIR" = "x"; then
-               RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
+--- graphviz-2.30.1/configure.ac.orig  2013-03-30 13:33:33.991726307 +0100
++++ graphviz-2.30.1/configure.ac       2013-03-30 13:35:38.171723708 +0100
+@@ -1567,7 +1567,7 @@
+           if test "x$DARWIN" == "xyes"; then
+             RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
+           fi
+-            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 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
 @@ -8,6 +8,10 @@

diff --git a/graphviz.spec b/graphviz.spec
index f8162e56ed80ddf46281182c0d34420207697d92..4e1d470458b6ae8451e6c1f0df1fbfc1aab5a20e 100644 (file)
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,13 +1,13 @@
 # TODO
 # - move Qt/GUI stuff into separate package
 # - %{_libdir}/graphviz/config is not FHS friendly path as config
-# - go language binding [6g, 8g???]
 # - io language binding: io-graphviz
 # - some plugin subpackages? (libgvplugin_*: gs=ghostscript, gtk, lasi, ming, visio, webp)
 # - smyrna subpackage? (R: OpenGL, glut, gtk+2, gtkglext, libglade2)
 #
 # Conditional build:
 %bcond_without dotnet          # don't build C# 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
@@ -34,22 +34,25 @@
 %ifarch i386 i486
 %undefine with_java
 %endif
+%ifnarch %{ix86} %{x8664} %{arm}
+%undefine with_golang
+%endif
 %{?with_perl:%include  /usr/lib/rpm/macros.perl}
 Summary:       Graph Visualization Tools
 Summary(pl.UTF-8):     Narzędzie do wizualizacji w postaci grafów
 Name:          graphviz
-Version:       2.30.0
-Release:       2
+Version:       2.30.1
+Release:       1
 License:       CPL v1.0
 Group:         X11/Applications/Graphics
 Source0:       http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
-# Source0-md5: 967ad0a3d2bf164082e076c4416ede95
+# Source0-md5: 8130785a8f1fb8a57f6b839b617e85fa
 Patch0:                %{name}-fontpath.patch
 Patch1:                %{name}-tk.patch
 Patch2:                %{name}-bad-header.patch
 Patch3:                %{name}-php.patch
 Patch4:                %{name}-ltdl.patch
-Patch5:                %{name}-lua51.patch
+Patch5:                %{name}-go.patch
 Patch6:                %{name}-php_modules_dir.patch
 Patch7:                %{name}-ruby.patch
 Patch8:                %{name}-guile.patch
@@ -75,6 +78,7 @@ BuildRequires:        gd-devel >= 2.0.34
 BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-devel
 BuildRequires: ghostscript-devel
+%{?with_golang:BuildRequires:  golang}
 BuildRequires: gtk+2-devel >= 2:2.8.0
 BuildRequires: gts-devel
 %{?with_guile:BuildRequires:   guile-devel >= 2.0}
@@ -202,6 +206,19 @@ This package provides some example graphs.
 %description graphs -l pl.UTF-8
 Ten pakiet zawiera trochę przykładowych grafów.
 
+%package -n golang-%{name}
+Summary:       Go binding for graphviz
+Summary(pl.UTF-8):     Wiązania języka Go dla graphviza
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      golang
+
+%description -n golang-%{name}
+Go binding for graphviz.
+
+%description -n golang-%{name} -l pl.UTF-8
+Wiązania języka Go dla graphviza.
+
 %package -n guile-%{name}
 Summary:       Guile binding for graphviz
 Summary(pl.UTF-8):     Wiązania Guile dla graphviza
@@ -385,8 +402,10 @@ CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 export CPPFLAGS
 
 %configure \
+       LUA=/usr/bin/lua51 \
        lua_suffix=51 \
        %{!?with_devil:--disable-devil} \
+       %{?with_golang:--enable-go} \
        %{!?with_java:--disable-java} \
        --disable-ltdl-install \
        %{!?with_lua:--disable-lua} \
@@ -645,8 +664,16 @@ fi
 %defattr(644,root,root,755)
 %{_datadir}/graphviz/graphs
 
+%if %{with golang}
+%files -n golang-%{name}
+%defattr(644,root,root,755)
+%dir %{_libdir}/graphviz/go
+%attr(755,root,root) %{_libdir}/graphviz/go/libgv_go.so
+%{_mandir}/man3/gv_go.3*
+%endif
+
 %if 0
-%files io-%{name}
+%files -n io-%{name}
 %defattr(644,root,root,755)
 %dir %{_libdir}/graphviz/io
 %attr(755,root,root) %{_libdir}/graphviz/io/libgv_io.so*