rpms
/
graphviz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New version 

Resolves: rhbz#911520
  Resolves: rhbz#704529
This commit is contained in:
Jaroslav Škarvada 2013-02-15 12:06:31 +01:00
parent aca33737b9
commit 3d745e2ab2
4 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -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

27
graphviz-2.30.1-guile2-fix.patch Normal file
View File

@ -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

11
graphviz.spec
View File

@ -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 <jskarvad@redhat.com> - 2.30.1-1
- New version
Resolves: rhbz#911520
Resolves: rhbz#704529
* Thu Jan 24 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.30.0-3
- Used ocaml_arches macros to enable ocaml on supported arches

2
sources
View File

@ -1 +1 @@
967ad0a3d2bf164082e076c4416ede95 graphviz-2.30.0.tar.gz
8130785a8f1fb8a57f6b839b617e85fa graphviz-2.30.1.tar.gz