From 5f3ee7929b6f0b397bf77a74c89f79fb23565f82 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: May 13 2011 08:01:05 +0000 Subject: 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) --- diff --git a/.gitignore b/.gitignore index 0731299..a012b12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ graphviz-2.26.0.tar.gz /graphviz-2.26.3.tar.gz +/graphviz-2.28.0.tar.gz diff --git a/graphviz-2.26.0-doc-index-fix.patch b/graphviz-2.26.0-doc-index-fix.patch deleted file mode 100644 index ec36c46..0000000 --- a/graphviz-2.26.0-doc-index-fix.patch +++ /dev/null @@ -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 @@ - -
  • Guides (PDF) -@@ -26,45 +25,41 @@ - -
  • Command manual pages (PDF) - -
  • Tcl package manual pages (PDF) - -
  • Library manual pages (PDF) - - - diff --git a/graphviz-2.26.0-gtk-progname.patch b/graphviz-2.26.0-gtk-progname.patch deleted file mode 100644 index 795c233..0000000 --- a/graphviz-2.26.0-gtk-progname.patch +++ /dev/null @@ -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.", diff --git a/graphviz-2.26.3-ppc-darwinhack.patch b/graphviz-2.26.3-ppc-darwinhack.patch deleted file mode 100644 index 9adb15c..0000000 --- a/graphviz-2.26.3-ppc-darwinhack.patch +++ /dev/null @@ -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 diff --git a/graphviz-sparc64.patch b/graphviz-sparc64.patch deleted file mode 100644 index 248bdbb..0000000 --- a/graphviz-sparc64.patch +++ /dev/null @@ -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 diff --git a/graphviz.spec b/graphviz.spec index c675e0c..91d73ef 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -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 - 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 - 2.26.3-5 - Disable mono and ocaml on alpha diff --git a/sources b/sources index efbb2d8..8c73f45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f45946fa622770c45609778c0a982ee graphviz-2.26.3.tar.gz +8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz