diff --git a/graphviz-2.28.0-guile-detect.patch b/graphviz-2.28.0-guile-detect.patch new file mode 100644 index 0000000..e3bd3c4 --- /dev/null +++ b/graphviz-2.28.0-guile-detect.patch @@ -0,0 +1,31 @@ +diff -up ./graphviz-2.28.0/configure.xorig ./graphviz-2.28.0/configure +--- graphviz-2.28.0/configure.xorig 2011-05-07 05:27:36.000000000 +0200 ++++ graphviz-2.28.0/configure 2011-05-19 13:45:26.026395747 +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 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'` + 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,9 +20081,16 @@ fi + if test "x$GUILE" = "x"; then + use_guile="No (guile is too old)" + else +- GUILE_INCLUDES= +- GUILE_LIBS= ++ GUILE_INCLUDES=`$PKG_CONFIG --cflags "guile-$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR" 2>/dev/null` ++ GUILE_LIBS=`$PKG_CONFIG --libs "guile-$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR" 2>/dev/null` ++ ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_CPPFLAGS="$CPPFLAGS" ++ CFLAGS="$CFLAGS $GUILE_INCLUDES" ++ CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES" + ac_fn_c_check_header_mongrel "$LINENO" "libguile.h" "ac_cv_header_libguile_h" "$ac_includes_default" ++ CFLAGS="$ac_save_CFLAGS" ++ CPPFLAGS="$ac_save_CPPFLAGS" + if test "x$ac_cv_header_libguile_h" = x""yes; then : + + else diff --git a/graphviz.spec b/graphviz.spec index 0d4032b..f7dd156 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -4,11 +4,13 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.28.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: EPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz +# Fix detection of guile 2.x (#704529) +Patch2: graphviz-2.28.0-guile-detect.patch # Fix SIGSEGVs on testsuite (#645703). Patch3: graphviz-2.26.0-testsuite-sigsegv-fix.patch # Testsuite now do diff check also in case of err output (#645703). @@ -196,6 +198,7 @@ Various tcl packages (extensions) for the graphviz tools. %prep %setup -q +%patch2 -p1 -b .guile-detect %patch3 -p1 -b .testsuite-sigsegv-fix %patch4 -p1 -b .rtest-errout-fix @@ -404,6 +407,10 @@ fi %changelog +* Thu May 19 2011 Jaroslav Škarvada - 2.28.0-4 +- Fixed detection of guile 2.x + Resolves: rhbz#704529 + * Fri May 13 2011 Jaroslav Škarvada - 2.28.0-3 - Corrected license tag, the graphviz license is now EPL