[graphviz] - New version (#580017) - Fixed gtk plugin program-name (#640671, gtk-progname patch) - Fixed broken
Jaroslav Škarvada
jskarvad at fedoraproject.org
Thu Jan 6 23:05:12 UTC 2011
commit 36b7ab18a31385cbc5fa655e3bdad469a9aa2d07
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Fri Jan 7 00:04:57 2011 +0100
- New version (#580017)
- Fixed gtk plugin program-name (#640671, gtk-progname patch)
- Fixed broken links in doc index (#642536, doc-index-fix patch)
- Fixed SIGSEGVs on testsuite (#645703, testsuite-sigsegv-fix patch)
- Testsuite now do diff check also in case of err output (#645703,
rtest-errout-fix patch)
- Testsuite enabled on all arches (#645703)
- Added urw-fonts to BuildRequires
- Compiled with -fno-strict-aliasing
- Fixed rpmlint warnings on spec file
- Removed unused patches
.gitignore | 1 +
graphviz-2.20.3-configure-php.patch | 13 --
graphviz-2.20.3-gv.i.patch | 45 -------
graphviz-2.26.0-doc-index-fix.patch | 85 +++++++++++++
graphviz-2.26.0-gtk-progname.patch | 11 ++
graphviz-2.26.0-rtest-errout-fix.patch | 22 ++++
graphviz-2.26.0-testsuite-sigsegv-fix.patch | 26 ++++
graphviz-arith.patch | 29 -----
graphviz-black.patch | 29 -----
graphviz-gcc43.patch | 32 -----
graphviz-libcdt.patch | 11 --
graphviz-multilib.patch | 14 --
graphviz-php5.patch | 30 -----
graphviz-tk8.5.patch | 181 ---------------------------
graphviz.spec | 57 ++++++---
sources | 2 +-
16 files changed, 186 insertions(+), 402 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1506006..0731299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
graphviz-2.26.0.tar.gz
+/graphviz-2.26.3.tar.gz
diff --git a/graphviz-2.26.0-doc-index-fix.patch b/graphviz-2.26.0-doc-index-fix.patch
new file mode 100644
index 0000000..ec36c46
--- /dev/null
+++ b/graphviz-2.26.0-doc-index-fix.patch
@@ -0,0 +1,85 @@
+--- graphviz-2.26.0/doc/index.html.old 2008-08-25 19:09:29.000000000 +0200
++++ graphviz-2.26.0/doc/index.html 2010-10-13 14:52:56.000000000 +0200
+@@ -13,7 +13,6 @@
+ <ul>
+ <li><a href="FAQ.html">FAQ</a>
+ <li><a href="build.html">build</a>
+- <li><a href="gd.html">gd</a>
+ <li><a href="tcldot.html">tcldot</a>
+ </ul>
+ <li>Guides (PDF)
+@@ -26,45 +25,41 @@
+ </ul>
+ <li>Command manual pages (PDF)
+ <ul>
+- <li><a href="../pdf/acyclic.pdf">acyclic.1</a>
+- <li><a href="../pdf/bcomps.pdf">bcmps.1</a>
+- <li><a href="../pdf/ccomps.pdf">ccomps.1</a>
+- <li><a href="../pdf/circo.pdf">circo.1</a>
+- <li><a href="../pdf/dijkstra.pdf">dijkstra.1</a>
+- <li><a href="../pdf/dot.pdf">dot.1</a>
+- <li><a href="../pdf/dot2gxl.pdf">dot2gxl.1</a>
+- <li><a href="../pdf/dotneato-config.pdf">dotneato-config.1</a>
+- <li><a href="../pdf/dotty.pdf">dotty.1</a>
+- <li><a href="../pdf/fdp.pdf">fdp.1</a>
+- <li><a href="../pdf/gc.pdf">gc.1</a>
+- <li><a href="../pdf/gvcolor.pdf">gvcolor.1</a>
+- <li><a href="../pdf/gvpack.pdf">gvpack.1</a>
+- <li><a href="../pdf/gvpr.pdf">gvpr.1</a>
+- <li><a href="../pdf/gxl2dot.pdf">gxl2dot.1</a>
+- <li><a href="../pdf/lefty.pdf">lefty.1</a>
+- <li><a href="../pdf/lneato.pdf">lneato.1</a>
+- <li><a href="../pdf/neato.pdf">neato.1</a>
+- <li><a href="../pdf/nop.pdf">nop.1</a>
+- <li><a href="../pdf/prune.pdf">prune.1</a>
+- <li><a href="../pdf/sccmap.pdf">sccmap.1</a>
+- <li><a href="../pdf/tred.pdf">tred.1</a>
+- <li><a href="../pdf/twopi.pdf">twopi.1</a>
+- <li><a href="../pdf/unflatten.pdf">unflatten.1</a>
++ <li><a href="../pdf/acyclic.1.pdf">acyclic</a>
++ <li><a href="../pdf/bcomps.1.pdf">bcmps</a>
++ <li><a href="../pdf/ccomps.1.pdf">ccomps</a>
++ <li><a href="../pdf/circo.1.pdf">circo</a>
++ <li><a href="../pdf/dijkstra.1.pdf">dijkstra</a>
++ <li><a href="../pdf/dot.1.pdf">dot</a>
++ <li><a href="../pdf/dotty.1.pdf">dotty</a>
++ <li><a href="../pdf/fdp.1.pdf">fdp</a>
++ <li><a href="../pdf/gc.1.pdf">gc</a>
++ <li><a href="../pdf/gvcolor.1.pdf">gvcolor</a>
++ <li><a href="../pdf/gvpack.1.pdf">gvpack</a>
++ <li><a href="../pdf/gvpr.1.pdf">gvpr</a>
++ <li><a href="../pdf/lefty.1.pdf">lefty</a>
++ <li><a href="../pdf/lneato.1.pdf">lneato</a>
++ <li><a href="../pdf/neato.1.pdf">neato</a>
++ <li><a href="../pdf/nop.1.pdf">nop</a>
++ <li><a href="../pdf/prune.pdf">prune</a>
++ <li><a href="../pdf/sccmap.1.pdf">sccmap</a>
++ <li><a href="../pdf/tred.1.pdf">tred</a>
++ <li><a href="../pdf/twopi.1.pdf">twopi</a>
++ <li><a href="../pdf/unflatten.1.pdf">unflatten</a>
+ </ul>
+ <li>Tcl package manual pages (PDF)
+ <ul>
+- <li><a href="../pdf/gdtclft.pdf">gdtclft.n</a>
+- <li><a href="../pdf/tcldot.pdf">tcldot.n</a>
+- <li><a href="../pdf/tkspline.pdf">tkspline.n</a>
++ <li><a href="../pdf/gdtclft.3tcl.pdf">gdtclft</a>
++ <li><a href="../pdf/tcldot.3tcl.pdf">tcldot</a>
++ <li><a href="../pdf/gv.3tcl.pdf">gv</a>
++ <li><a href="../pdf/tkspline.3tk.pdf">tkspline</a>
+ </ul>
+ <li>Library manual pages (PDF)
+ <ul>
+- <li><a href="../pdf/agraph.pdf">agraph.3</a>
+- <li><a href="../pdf/cdt.pdf">cdt.3</a>
+- <li><a href="../pdf/expr.pdf">expr.3</a>
+- <li><a href="../pdf/graph.pdf">graph.3</a>
+- <li><a href="../pdf/pathplan.pdf">pathplan.3</a>
+- <li><a href="../pdf/pack.pdf">pack.3</a>
++ <li><a href="../pdf/cgraph.3.pdf">cgraph</a>
++ <li><a href="../pdf/cdt.3.pdf">cdt</a>
++ <li><a href="../pdf/graph.3.pdf">graph</a>
++ <li><a href="../pdf/pathplan.3.pdf">pathplan</a>
+ </ul>
+ </ul>
+ </body>
diff --git a/graphviz-2.26.0-gtk-progname.patch b/graphviz-2.26.0-gtk-progname.patch
new file mode 100644
index 0000000..795c233
--- /dev/null
+++ b/graphviz-2.26.0-gtk-progname.patch
@@ -0,0 +1,11 @@
+--- graphviz-2.26.0/plugin/gtk/callbacks.c.old 2009-06-03 03:10:57.000000000 +0200
++++ graphviz-2.26.0/plugin/gtk/callbacks.c 2010-10-06 17:38:59.703008542 +0200
+@@ -187,7 +187,7 @@
+ NULL };
+ GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(menuitem)));
+ gtk_show_about_dialog(window,
+- "name", "DotEdit",
++ "program-name", "DotEdit",
+ "version", "0.1",
+ "copyright", "(C) 2005 AT&T Corp.",
+ "license", "Common Public License, Version 1.0.",
diff --git a/graphviz-2.26.0-rtest-errout-fix.patch b/graphviz-2.26.0-rtest-errout-fix.patch
new file mode 100644
index 0000000..83f0cb2
--- /dev/null
+++ b/graphviz-2.26.0-rtest-errout-fix.patch
@@ -0,0 +1,22 @@
+--- graphviz-2.26.0/rtest/rtest.sh.old 2009-12-06 00:27:49.000000000 +0100
++++ graphviz-2.26.0/rtest/rtest.sh 2010-10-22 10:37:42.952893435 +0200
+@@ -279,14 +279,16 @@
+ $testcmd 2> errout
+ RVAL=$?
+
++ if [[ -s errout ]]
++ then
++ cat errout
++ fi
++
+ if [[ $RVAL != 0 || ! -s $OUTPATH ]]
+ then
+ (( CRASH_CNT+=1 ))
+ print -u 2 "Test $TESTNAME:$i : == Layout failed =="
+ print -u 2 " $testcmd"
+- elif [[ -s errout ]]
+- then
+- cat errout
+ elif [[ $GENERATE == 1 ]]
+ then
+ continue
diff --git a/graphviz-2.26.0-testsuite-sigsegv-fix.patch b/graphviz-2.26.0-testsuite-sigsegv-fix.patch
new file mode 100644
index 0000000..d278bc1
--- /dev/null
+++ b/graphviz-2.26.0-testsuite-sigsegv-fix.patch
@@ -0,0 +1,26 @@
+--- graphviz-2.26.0/lib/gvc/gvconfig.c.old 2009-07-08 17:14:20.000000000 +0200
++++ graphviz-2.26.0/lib/gvc/gvconfig.c 2010-10-20 11:51:21.238392202 +0200
+@@ -471,6 +471,7 @@
+ libdir = gvconfig_libdir(gvc);
+ rc = stat(libdir, &libdir_st);
+ if (rc == -1) {
++ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
+ /* if we fail to stat it then it probably doesn't exist so just fail silently */
+ return;
+ }
+@@ -485,6 +486,7 @@
+ if (rescan) {
+ config_rescan(gvc, gvc->config_path);
+ gvc->config_found = TRUE;
++ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
+ return;
+ }
+
+@@ -492,6 +494,7 @@
+
+ rc = stat(gvc->config_path, &config_st);
+ if (rc == -1) {
++ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
+ /* silently return without setting gvc->config_found = TRUE */
+ return;
+ }
diff --git a/graphviz.spec b/graphviz.spec
index 7c36514..c54e78e 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -3,13 +3,22 @@
Name: graphviz
Summary: Graph Visualization Tools
-Version: 2.26.0
-Release: 4%{?dist}
+Version: 2.26.3
+Release: 1%{?dist}
Group: Applications/Multimedia
License: CPL
URL: http://www.graphviz.org/
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
+# Fix for sparc64.
Patch0: graphviz-sparc64.patch
+# Fix gtk plugin program-name (#640671).
+Patch1: graphviz-2.26.0-gtk-progname.patch
+# Fix broken links in doc index (#642536).
+Patch2: graphviz-2.26.0-doc-index-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).
+Patch4: graphviz-2.26.0-rtest-errout-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
BuildRequires: /bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
@@ -20,7 +29,7 @@ BuildRequires: gd-devel, perl-devel, DevIL-devel, R-devel, swig >= 1.3.33
%ifnarch ppc64 s390 s390x sparc64 %{arm}
BuildRequires: mono-core, ocaml
%endif
-Requires: urw-fonts
+BuildRequires: urw-fonts
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -50,9 +59,9 @@ and edges, not as in barcharts). This package contains development files for
graphviz.
%package devil
-Group: Applications/Multimedia
-Summary: Graphviz plugin for renderers based on DevIL
-Requires: %{name} = %{version}-%{release}
+Group: Applications/Multimedia
+Summary: Graphviz plugin for renderers based on DevIL
+Requires: %{name} = %{version}-%{release}
%description devil
Graphviz plugin for renderers based on DevIL. (Unless you absolutely have
@@ -196,7 +205,11 @@ Various tcl packages (extensions) for the graphviz tools.
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .sparc64
+%patch1 -p1 -b .gtk-progname
+%patch2 -p1 -b .doc-index-fix
+%patch3 -p1 -b .testsuite-sigsegv-fix
+%patch4 -p1 -b .rtest-errout-fix
%build
# %%define NO_IO --disable-io
@@ -217,14 +230,14 @@ sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linu
--without-ming \
%endif
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%install
rm -rf %{buildroot} __doc
make DESTDIR=%{buildroot} \
- docdir=%{buildroot}%{_docdir}/%{name} \
- pkgconfigdir=%{_libdir}/pkgconfig \
- install
+ docdir=%{buildroot}%{_docdir}/%{name} \
+ pkgconfigdir=%{_libdir}/pkgconfig \
+ install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
chmod -x %{buildroot}%{_datadir}/%{name}/lefty/*
cp -a %{buildroot}%{_datadir}/%{name}/doc __doc
@@ -238,11 +251,8 @@ extension=gv.so
__EOF__
%check
-%ifnarch ppc64 ppc sparc64
-# regression test, segfaults on ppc/ppc64/sparc64, possible endian issues?
cd rtest
make rtest
-%endif
%clean
rm -rf %{buildroot}
@@ -254,11 +264,11 @@ rm -rf %{buildroot}
# if there is no dot after everything else is done, then remove config
%postun
if [ $1 -eq 0 ]; then
- rm -f %{_libdir}/graphviz/config || :
+ rm -f %{_libdir}/graphviz/config || :
fi
/sbin/ldconfig
-# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
+# run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config
%post devil
%{_bindir}/dot -c
@@ -274,7 +284,7 @@ fi
[ -x %{_bindir}/dot ] && %{_bindir}/dot -c || :
%if %{MING}
-# run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
+# run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config
%post ming
%{_bindir}/dot -c
@@ -406,6 +416,19 @@ fi
%changelog
+* Thu Jan 06 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 2.26.3-1
+- New version (#580017)
+- Fixed gtk plugin program-name (#640671, gtk-progname patch)
+- Fixed broken links in doc index (#642536, doc-index-fix patch)
+- Fixed SIGSEGVs on testsuite (#645703, testsuite-sigsegv-fix patch)
+- Testsuite now do diff check also in case of err output (#645703,
+ rtest-errout-fix patch)
+- Testsuite enabled on all arches (#645703)
+- Added urw-fonts to BuildRequires
+- Compiled with -fno-strict-aliasing
+- Fixed rpmlint warnings on spec file
+- Removed unused patches
+
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.26.0-4
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/sources b/sources
index 08a0e50..efbb2d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0609b42cb9ef913b7af13e43c4d716c9 graphviz-2.26.0.tar.gz
+6f45946fa622770c45609778c0a982ee graphviz-2.26.3.tar.gz
More information about the scm-commits
mailing list