-enable rsvg plugin (for svg images) on rhel5, fc6, fc7 (in addition to fc8, fc9)

-enable R language binding on fc8, fc9

diff --git a/configure.ac b/configure.ac
index 0770a895ec87dff9522a95b69f2db51c2ea49422..3b571af0accebb66e3908064d9cea7a30b369273 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1031,13 +1031,13 @@ fi
 AM_CONDITIONAL(WITH_PYTHON25, [test "x$PYTHON25" != "x"])
 
 dnl -----------------------------------
-dnl INCLUDES and LIBS for R (disabled for now - swig generated gv_r.cpp doesn't compile)
+dnl INCLUDES and LIBS for R
 
 R=
 if test "x$SWIG" != "x"; then
 AC_ARG_ENABLE(r,
-  [AC_HELP_STRING([--enable-r=no], [R language bindings])],
-  [], [enable_r=no])
+  [AC_HELP_STRING([--enable-r=yes], [R language bindings])],
+  [], [enable_r=yes])
 if test "x$enable_r" = "xyes"; then
 if test `$SWIG -help 2>&1 | $GREP -c '\-r *- Generate'` = 0; then
        AC_MSG_WARN([swig does not support -r. The R packages will not be built])

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 50e598c298b1a4f493b038f146eb266b2efbc2fb..1ac505b7a627cbe83d880d02e39cb973d88ec73c 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -92,8 +92,10 @@ BuildRequires: perl ruby-devel guile-devel python-devel
 %if "%rhel" >= "5"
 %define JAVA   1
 %define PANGOCAIRO --with-pangocairo
+%define RSVG --with-rsvg
 BuildRequires: libtool-ltdl libtool-ltdl-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel java-devel
 BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel gtk2-devel libgnomeui-devel
+BuildRequires: librsvg2-devel
 %endif
 %if "%rhel" >= "6"
 %define PHP    1
@@ -139,7 +141,9 @@ BuildRequires: mono-core ocaml
 %if "%fedora" >= "6"
 %define LUA    1
 %define PANGOCAIRO --with-pangocairo
+%define RSVG --with-rsvg
 BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel libgnomeui-devel
+BuildRequires: librsvg2-devel
 %endif
 %if "%fedora" >= "7"
 %define DEVIL 1
@@ -148,10 +152,8 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel
 BuildRequires: gd gd-devel perl-devel DevIL-devel
 %endif
 %if "%fedora" >= "8"
-#define R_LANG 1
-#BuildRequires: R swig >= 1.3.33
-%define RSVG --with-rsvg
-BuildRequires: librsvg2
+%define R_LANG 1
+BuildRequires: R swig >= 1.3.33
 %endif
 %if "%fedora" >= "9"
 %define MING 0