From df7330352fbb94131b39aae84ab54f595fdc8a187bf093ad5a422cce2e084813 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@dinamizm.com>
Date: Mon, 11 Jun 2012 15:01:58 +0000
Subject: [PATCH] Accepting request 124476 from
 home:coolo:branches:openSUSE:Factory

- survive new ruby without autoreconf

OBS-URL: https://build.opensuse.org/request/show/124476
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=44
---
 graphviz-2.18-do_not_use_ocamlopt.patch | 20 +++++++++--
 graphviz-guile.patch                    | 45 ++++++++++++++++++++++---
 graphviz-plugins-fix_install_dirs.patch | 34 ++++++++++++++++---
 graphviz-plugins-tcl_install_dir.patch  | 24 +++++++++++--
 graphviz-plugins.changes                |  5 +++
 graphviz-plugins.spec                   |  6 +++-
 graphviz-python_version.patch           | 21 ++++++++++--
 7 files changed, 136 insertions(+), 19 deletions(-)

diff --git a/graphviz-2.18-do_not_use_ocamlopt.patch b/graphviz-2.18-do_not_use_ocamlopt.patch
index 55de314..76f96c2 100644
--- a/graphviz-2.18-do_not_use_ocamlopt.patch
+++ b/graphviz-2.18-do_not_use_ocamlopt.patch
@@ -1,6 +1,8 @@
---- tclpkg/gv/Makefile.am
-+++ tclpkg/gv/Makefile.am
-@@ -89,9 +89,9 @@
+Index: tclpkg/gv/Makefile.am
+===================================================================
+--- tclpkg/gv/Makefile.am.orig	2012-06-11 16:26:00.110677422 +0200
++++ tclpkg/gv/Makefile.am	2012-06-11 16:29:39.727382908 +0200
+@@ -100,9 +100,9 @@ gv_lua.cpp: gv.i
  
  pkgocamldir = $(pkglibdir)/ocaml
  OCAML_data = gv.cmo gv.cma gv.cmi gv.mli META.gv
@@ -13,3 +15,15 @@
  nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_data)
  libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
  libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS)
+Index: tclpkg/gv/Makefile.in
+===================================================================
+--- tclpkg/gv/Makefile.in.orig	2012-06-11 16:26:00.000000000 +0200
++++ tclpkg/gv/Makefile.in	2012-06-11 16:30:07.711071262 +0200
+@@ -38,7 +38,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ @WITH_CGRAPH_TRUE@am__append_1 = -DWITH_CGRAPH
+-@WITH_OCAMLOPT_TRUE@am__append_2 = gv.a gv.cmx gv.cmxa
+ @WITH_SHARP_TRUE@@WITH_SWIG_TRUE@am__append_3 = gv.3sharp
+ @WITH_SHARP_TRUE@@WITH_SWIG_TRUE@am__append_4 = gv.3sharp.pdf
+ @WITH_SHARP_TRUE@@WITH_SWIG_TRUE@am__append_5 = test_sharp
diff --git a/graphviz-guile.patch b/graphviz-guile.patch
index 84e524b..7c6893c 100644
--- a/graphviz-guile.patch
+++ b/graphviz-guile.patch
@@ -1,6 +1,8 @@
---- graphviz-2.28.0/configure.ac.orig	2011-05-17 20:36:04.898079515 +0200
-+++ graphviz-2.28.0/configure.ac	2011-05-17 21:16:08.718160002 +0200
-@@ -676,7 +676,7 @@
+Index: graphviz-2.28.0/configure.ac
+===================================================================
+--- graphviz-2.28.0.orig/configure.ac	2012-06-11 16:27:06.331573194 +0200
++++ graphviz-2.28.0/configure.ac	2012-06-11 16:28:11.651511310 +0200
+@@ -676,7 +676,7 @@ else
        if test "x$GUILE" = "x"; then
          use_guile="No (guile not available)"
        else
@@ -9,7 +11,7 @@
          GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
          GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
          if test $GUILE_VERSION_MAJOR -lt 2; then
-@@ -691,12 +691,15 @@
+@@ -691,12 +691,15 @@ else
          if test "x$GUILE" = "x"; then
  	  use_guile="No (guile is too old)"
          else
@@ -27,4 +29,37 @@
            if test "x$GUILE" != "x"; then
  	    use_guile="Yes"
              AC_SUBST(GUILE_INCLUDES)
-
+Index: graphviz-2.28.0/configure
+===================================================================
+--- graphviz-2.28.0.orig/configure	2012-06-11 16:27:26.000000000 +0200
++++ graphviz-2.28.0/configure	2012-06-11 16:29:17.500424846 +0200
+@@ -20066,7 +20066,7 @@ fi
+       if test "x$GUILE" = "x"; then
+         use_guile="No (guile not available)"
+       else
+-        GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2`
++        GUILE_VERSION=$($GUILE --version | head -1 | sed -e 's/.* \([[0-9.]*]\)$/\1/')
+         GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
+         GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
+         if test $GUILE_VERSION_MAJOR -lt 2; then
+@@ -20081,8 +20081,10 @@ fi
+         if test "x$GUILE" = "x"; then
+ 	  use_guile="No (guile is too old)"
+         else
+-          GUILE_INCLUDES=
+-          GUILE_LIBS=
++          GUILE_INCLUDES=$(guile-config compile)
++          GUILE_LIBS=$(guile-config link)
++          save_CPPFLAGS="$CPPFLAGS";
++          CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES";
+           ac_fn_c_check_header_mongrel "$LINENO" "libguile.h" "ac_cv_header_libguile_h" "$ac_includes_default"
+ if test "x$ac_cv_header_libguile_h" = x""yes; then :
+ 
+@@ -20092,6 +20094,7 @@ else
+             GUILE=
+ 
+ fi
++	 CPPFLAGS="$save_CPPFLAGS";
+ 
+ 
+           if test "x$GUILE" != "x"; then
diff --git a/graphviz-plugins-fix_install_dirs.patch b/graphviz-plugins-fix_install_dirs.patch
index 801532a..bf0cfdd 100644
--- a/graphviz-plugins-fix_install_dirs.patch
+++ b/graphviz-plugins-fix_install_dirs.patch
@@ -1,6 +1,8 @@
---- configure.ac
-+++ configure.ac
-@@ -1013,8 +1013,8 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig	2012-06-11 16:25:59.960684453 +0200
++++ configure.ac	2012-06-11 16:26:07.060351640 +0200
+@@ -1055,8 +1055,8 @@ else
          else
            PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
          fi
@@ -11,7 +13,7 @@
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -1489,7 +1489,7 @@
+@@ -1597,7 +1597,7 @@ if test "x$use_tcl" = "x"; then
      AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built])
      use_tcl="No (missing tclConfig.sh)"
    fi
@@ -19,4 +21,28 @@
 +  TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
  fi
  
+ if test "x$use_tcl" = "x"; then
+Index: configure
+===================================================================
+--- configure.orig	2012-06-11 16:25:59.000000000 +0200
++++ configure	2012-06-11 16:27:00.874828987 +0200
+@@ -21022,8 +21022,8 @@ fi
+         else
+           PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
+         fi
+-        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
+-        PHP_INSTALL_DATADIR="/usr/share/php"
++        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
++        PHP_INSTALL_DATADIR="/usr/share/php5"
+         PHP_LIBS=
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
+@@ -22032,7 +22032,7 @@ $as_echo "using $TCLCONFIG" >&6; }
+ $as_echo "$as_me: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&2;}
+     use_tcl="No (missing tclConfig.sh)"
+   fi
+-  TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
++  TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
+ fi
+ 
  if test "x$use_tcl" = "x"; then
diff --git a/graphviz-plugins-tcl_install_dir.patch b/graphviz-plugins-tcl_install_dir.patch
index b40e3e2..7bd704b 100644
--- a/graphviz-plugins-tcl_install_dir.patch
+++ b/graphviz-plugins-tcl_install_dir.patch
@@ -1,6 +1,8 @@
---- tclpkg/Makefile.am
-+++ tclpkg/Makefile.am
-@@ -15,9 +15,9 @@
+Index: tclpkg/Makefile.am
+===================================================================
+--- tclpkg/Makefile.am.orig	2012-06-11 16:26:00.106677610 +0200
++++ tclpkg/Makefile.am	2012-06-11 16:27:30.595435808 +0200
+@@ -18,9 +18,9 @@ pkgpython26dir = $(pkglibdir)/python26
  pkgpython27dir = $(pkglibdir)/python27
  pkgRdir = $(pkglibdir)/R
  pkgrubydir = $(pkglibdir)/ruby
@@ -12,3 +14,19 @@
  if WITH_TCL
  pkgindex_DATA = pkgIndex.tcl
  endif
+Index: tclpkg/Makefile.in
+===================================================================
+--- tclpkg/Makefile.in.orig	2012-06-11 16:26:00.000000000 +0200
++++ tclpkg/Makefile.in	2012-06-11 16:28:03.111911549 +0200
+@@ -487,8 +487,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 = Makefile.old mkpkgindex.sh
diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes
index 0613e5c..9db53fc 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 11 14:55:13 UTC 2012 - coolo@suse.com
+
+- survive new ruby without autoreconf
+
 -------------------------------------------------------------------
 Wed Apr  4 10:58:25 UTC 2012 - reddwarf@opensuse.org
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index 4843f40..b1cda6a 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -248,12 +248,16 @@ Provides some additional PDF and HTML documentation for graphviz.
 sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl
 
 %build
-autoreconf
 WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith"
 CFLAGS="%{optflags} $WARN_FLAGS"
 %ifarch %ix86 x86_64
 CFLAGS="$CFLAGS -ffast-math"
 %endif
+%if %suse_version > 1210
+rubyflags=$(pkg-config --cflags ruby-1.9)
+CFLAGS="$CFLAGS $rubyflags"
+CXXFLAGS="$CXXFLAGS $rubyflags"
+%endif
 
 export CFLAGS
 export CXXFLAGS="$CXXFLAGS -fpermissive"
diff --git a/graphviz-python_version.patch b/graphviz-python_version.patch
index 2104ea8..875afe0 100644
--- a/graphviz-python_version.patch
+++ b/graphviz-python_version.patch
@@ -1,6 +1,21 @@
---- configure.ac
-+++ configure.ac
-@@ -1056,7 +1056,7 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig	2012-06-11 16:26:07.060351640 +0200
++++ configure.ac	2012-06-11 16:27:06.331573194 +0200
+@@ -1098,7 +1098,7 @@ else
+       if test "x$PYTHON" = "x"; then
+         use_python="No (python not available)"
+       else
+-        PYTHON_VERSION=`$PYTHON -V 2>&1 | $GREP Python | cut -d ' ' -f 2`
++        PYTHON_VERSION=`python -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"`
+         if test "x$PYTHON_VERSION" = "x"; then
+           PYTHON=
+         else
+Index: configure
+===================================================================
+--- configure.orig	2012-06-11 16:27:00.000000000 +0200
++++ configure	2012-06-11 16:27:26.152644075 +0200
+@@ -21117,7 +21117,7 @@ fi
        if test "x$PYTHON" = "x"; then
          use_python="No (python not available)"
        else