New version 2.28.0
Added perl-ExtUtils-Embed to BuildRequires, it is now required Fixed build failure due to change in php_zend_api macro type Removed sparc64, gtk-progname, doc-index-fix, ppc-darwinhack patches (all were upstreamed)
This commit is contained in:
Jaroslav Škarvada
parent
46567d07c9
commit
5f3ee7929b
|
|
@ -1,2 +1,3 @@
|
|||
graphviz-2.26.0.tar.gz
|
||||
/graphviz-2.26.3.tar.gz
|
||||
/graphviz-2.28.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,85 +0,0 @@
|
|||
--- 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>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- 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.",
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -up graphviz-2.26.3/configure.fc15 graphviz-2.26.3/configure
|
||||
--- graphviz-2.26.3/configure.fc15 2011-01-21 13:55:37.913416407 +0000
|
||||
+++ graphviz-2.26.3/configure 2011-01-21 14:01:48.333416483 +0000
|
||||
@@ -27576,7 +27576,9 @@ fi
|
||||
else
|
||||
RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
|
||||
# hack for powerpc-darwin8 (10.4)
|
||||
- RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
|
||||
+ if test "x$DARWIN" = "xyes"; then
|
||||
+ RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
|
||||
+ fi
|
||||
RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`"
|
||||
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
|
||||
save_CPPFLAGS=$CPPFLAGS
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- graphviz-2.26.0/configure.sparc64 2009-12-10 17:30:43.000000000 -0600
|
||||
+++ graphviz-2.26.0/configure 2009-12-18 11:31:30.000000000 -0600
|
||||
@@ -2834,7 +2834,7 @@
|
||||
case "${host_os}" in
|
||||
*linux* )
|
||||
case "${host_cpu}" in
|
||||
- powerpc64 | s390x | x86_64 )
|
||||
+ powerpc64 | s390x | x86_64 | sparc64 )
|
||||
LIBPOSTFIX="64"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -3,23 +3,16 @@
|
|||
|
||||
Name: graphviz
|
||||
Summary: Graph Visualization Tools
|
||||
Version: 2.26.3
|
||||
Release: 5%{?dist}
|
||||
Version: 2.28.0
|
||||
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
|
||||
Patch5: graphviz-2.26.3-ppc-darwinhack.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
|
||||
|
|
@ -30,7 +23,7 @@ BuildRequires: gd-devel, perl-devel, DevIL-devel, R-devel, swig >= 1.3.33
|
|||
%ifnarch ppc64 s390 s390x sparc64 %{arm} alpha
|
||||
BuildRequires: mono-core, ocaml
|
||||
%endif
|
||||
BuildRequires: urw-fonts
|
||||
BuildRequires: urw-fonts, perl-ExtUtils-Embed
|
||||
Requires: urw-fonts
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
|
@ -153,12 +146,8 @@ Perl extension for graphviz.
|
|||
Group: Applications/Multimedia
|
||||
Summary: PHP extension for graphviz
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if %{?php_zend_api}0
|
||||
Requires: php(zend-abi) = %{php_zend_api}
|
||||
Requires: php(api) = %{php_core_api}
|
||||
%else
|
||||
Requires: php-api = %{php_apiver}
|
||||
%endif
|
||||
|
||||
%description php
|
||||
PHP extension for graphviz.
|
||||
|
|
@ -207,12 +196,8 @@ Various tcl packages (extensions) for the graphviz tools.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%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
|
||||
%patch5 -p1 -b .powerpc-darwin
|
||||
|
||||
%build
|
||||
# %%define NO_IO --disable-io
|
||||
|
|
@ -419,6 +404,13 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue May 10 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2.28.0-1
|
||||
- New version 2.28.0
|
||||
- Added perl-ExtUtils-Embed to BuildRequires, it is now required
|
||||
- Fixed build failure due to change in php_zend_api macro type
|
||||
- Removed sparc64, gtk-progname, doc-index-fix, ppc-darwinhack
|
||||
patches (all were upstreamed)
|
||||
|
||||
* Thu Mar 03 2011 Oliver Falk <oliver@linux-kernel.at> - 2.26.3-5
|
||||
- Disable mono and ocaml on alpha
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue