- Apply patch from darix to ask ruby for directories.

- Fix install path for tcl plugins.
- Fix file list for gnome plugins.
- Remove graphviz-plugins-fix_install_dirs.patch as it's not needed
  anymore.

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=89

graphviz-plugins-tcl_install_dir.patch

@@ -1,37 +0,0 @@
----
- tclpkg/Makefile.am |    4 ++--
- tclpkg/Makefile.in |    5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-Index: tclpkg/Makefile.am
-===================================================================
---- tclpkg/Makefile.am.orig	2013-09-07 03:07:52.000000000 +0200
-+++ tclpkg/Makefile.am	2013-09-09 13:52:50.830269146 +0200
-@@ -18,9 +18,9 @@ pkgpython26dir = $(pkglibdir)/python26
- pkgpython27dir = $(pkglibdir)/python27
- pkgRdir = $(pkglibdir)/R
- pkgrubydir = $(pkglibdir)/ruby
--pkgtcldir = $(pkglibdir)/tcl
-+pkgtcldir = $(libdir)
- 
--pkgindexdir = $(pkgtcldir)
-+pkgindexdir = $(datadir)/tcl/@PACKAGE@
- if WITH_TCL
- pkgindex_DATA = pkgIndex.tcl
- endif
-Index: tclpkg/Makefile.in
-===================================================================
---- tclpkg/Makefile.in.orig	2013-09-07 03:11:21.000000000 +0200
-+++ tclpkg/Makefile.in	2013-09-09 13:52:50.830269146 +0200
-@@ -527,8 +527,9 @@ pkgpython26dir = $(pkglibdir)/python26
- pkgpython27dir = $(pkglibdir)/python27
- pkgRdir = $(pkglibdir)/R
- pkgrubydir = $(pkglibdir)/ruby
--pkgtcldir = $(pkglibdir)/tcl
--pkgindexdir = $(pkgtcldir)
-+pkgtcldir = $(libdir)
-+pkgindexdir = $(datadir)/tcl/@PACKAGE@
-+
- @WITH_TCL_TRUE@pkgindex_DATA = pkgIndex.tcl
- SUBDIRS = tclstubs tkstubs tclhandle gdtclft tcldot tclpathplan tkspline gv
- EXTRA_DIST = mkpkgindex.sh

graphviz-plugins.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jun 18 12:32:34 CEST 2014 - pth@suse.de
+
+- Apply patch from darix to ask ruby for directories.
+- Fix install path for tcl plugins.
+- Fix file list for gnome plugins.
+- Remove graphviz-plugins-fix_install_dirs.patch as it's not needed
+  anymore.
+
+-------------------------------------------------------------------
+Tue Jun 17 12:31:58 UTC 2014 - mrueckert@suse.de
+
+- instead of guessing the ruby paths. let's just use the existing
+  variables or at least ask ruby for it. 
+
 -------------------------------------------------------------------
 Fri May 23 16:46:05 CEST 2014 - pth@suse.de
 

graphviz-plugins.spec

@@ -64,6 +64,7 @@ BuildRequires:  ocaml
 BuildRequires:  perl
 BuildRequires:  php5-devel
 BuildRequires:  python-devel
+BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:  swig
 BuildRequires:  tk-devel >= 8.3
@@ -97,7 +98,6 @@ Patch3:         graphviz-no_strict_aliasing.patch
 Patch4:         graphviz-array_overflow.patch
 #Patches from 100 up are for graphviz-plugin only
 Patch100:       graphviz-plugins-fix_install_dirs.patch
-Patch102:       graphviz-plugins-tcl_install_dir.patch
 Patch103:       graphviz-2.20.2-interpreter_names.patch
 Patch106:       graphviz-fix-pkgIndex.patch
 #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
@@ -105,9 +105,8 @@ Patch108:       graphviz-useless_warnings.patch
 Requires(pre):  coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%define rb_libdir    %{_libdir}/ruby
-%define rb_sitedir   %{rb_libdir}/site_ruby/%{rb_ver}
-%define rb_vendordir %{rb_libdir}/vendor_ruby/%{rb_ver}
+%{!?rb_vendorarchdir: %global rb_vendorarchdir %(/usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]' )}
+%{!?rb_sitearchdir:   %global rb_sitearchdir   %(/usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' )}
 %define lua_libdir %{_libdir}/lua/%(pkg-config --variable=V lua)
 %define debug_package_requires graphviz_plugin = %{version}-%{release}
 
@@ -269,7 +268,6 @@ Provides some additional PDF and HTML documentation for graphviz.
 %patch3
 %patch4
 %patch100
-%patch102
 %patch103
 %patch106
 %patch108
@@ -349,6 +347,8 @@ done
 %fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}
 %endif
 rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
+install -Dd %{buildroot}%{rb_vendorarchdir}
+mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/%{mname}/pkgIndex.tcl
 
 %files -n graphviz-gd
 %defattr(-,root,root)
@@ -369,9 +369,9 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
 %files -n graphviz-gnome
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/libgvplugin_pango*
-%{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
 %{_libdir}/graphviz/libgvplugin_gtk*
 %{_libdir}/graphviz/libgvplugin_xlib*
+%{_libdir}/graphviz/libgvplugin_gdk*
 
 %post -n graphviz-tcl -p /sbin/ldconfig