From 3d745e2ab21a0fc5592ddc2fa9710c5d14844448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 Feb 2013 12:06:31 +0100 Subject: [PATCH] New version Resolves: rhbz#911520 Resolves: rhbz#704529 --- .gitignore | 5 +---- graphviz-2.30.1-guile2-fix.patch | 27 +++++++++++++++++++++++++++ graphviz.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 graphviz-2.30.1-guile2-fix.patch diff --git a/.gitignore b/.gitignore index 11890ed..cf3cadc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -graphviz-2.26.0.tar.gz -/graphviz-2.26.3.tar.gz -/graphviz-2.28.0.tar.gz -/graphviz-2.30.0.tar.gz +graphviz-*.tar.gz diff --git a/graphviz-2.30.1-guile2-fix.patch b/graphviz-2.30.1-guile2-fix.patch new file mode 100644 index 0000000..a952aee --- /dev/null +++ b/graphviz-2.30.1-guile2-fix.patch @@ -0,0 +1,27 @@ +diff -up graphviz-2.30.1/configure.ac.orig graphviz-2.30.1/configure.ac +--- graphviz-2.30.1/configure.ac.orig 2013-02-14 14:27:39.000000000 +0100 ++++ graphviz-2.30.1/configure.ac 2013-02-15 11:43:17.794608767 +0100 +@@ -710,7 +710,7 @@ else + GUILE_LIBS= + # don't die if PKG_CHECK_MODULES not available - el4, el5 + PKG_CHECK_MODULES([GUILE], +- [guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"], ++ [guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"], + GUILE_INCLUDES="$GUILE_CFLAGS", + [ + PKG_CHECK_MODULES([GUILE], +diff -up graphviz-2.30.1/configure.orig graphviz-2.30.1/configure +--- graphviz-2.30.1/configure.orig 2013-02-15 11:44:09.552556536 +0100 ++++ graphviz-2.30.1/configure 2013-02-14 14:30:22.000000000 +0100 +@@ -21028,9 +21028,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` ++ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` + else +- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` ++ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GUILE_PKG_ERRORS" >&5 diff --git a/graphviz.spec b/graphviz.spec index d40c181..ec25a8f 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -47,12 +47,13 @@ Name: graphviz Summary: Graph Visualization Tools -Version: 2.30.0 -Release: 3%{?dist} +Version: 2.30.1 +Release: 1%{?dist} Group: Applications/Multimedia License: EPL URL: http://www.graphviz.org/ Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz +Patch2: graphviz-2.30.1-guile2-fix.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). @@ -252,6 +253,7 @@ Various tcl packages (extensions) for the graphviz tools. %prep %setup -q +%patch2 -p1 -b .guile2-fix %patch3 -p1 -b .testsuite-sigsegv-fix %patch4 -p1 -b .rtest-errout-fix @@ -529,6 +531,11 @@ fi %changelog +* Fri Feb 15 2013 Jaroslav Škarvada - 2.30.1-1 +- New version + Resolves: rhbz#911520 + Resolves: rhbz#704529 + * Thu Jan 24 2013 Jaroslav Škarvada - 2.30.0-3 - Used ocaml_arches macros to enable ocaml on supported arches diff --git a/sources b/sources index 4edea9f..8f44fcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -967ad0a3d2bf164082e076c4416ede95 graphviz-2.30.0.tar.gz +8130785a8f1fb8a57f6b839b617e85fa graphviz-2.30.1.tar.gz