[graphviz] fix hack for powerpc-darwin8 in configure

Karsten Hopp karsten at fedoraproject.org
Fri Jan 21 13:27:40 UTC 2011


commit c5eb0961f0280195fbf1d400515d33ab20d6a0e5
Author: Karsten Hopp <karsten at redhat.com>
Date:   Fri Jan 21 14:27:21 2011 +0100

    fix hack for powerpc-darwin8 in configure

 graphviz-2.26.3-ppc-darwinhack.patch |   14 ++++++++++++++
 graphviz.spec                        |    7 ++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/graphviz-2.26.3-ppc-darwinhack.patch b/graphviz-2.26.3-ppc-darwinhack.patch
new file mode 100644
index 0000000..a1010bb
--- /dev/null
+++ b/graphviz-2.26.3-ppc-darwinhack.patch
@@ -0,0 +1,14 @@
+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.spec b/graphviz.spec
index c54e78e..d912d35 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -4,7 +4,7 @@
 Name:			graphviz
 Summary:		Graph Visualization Tools
 Version:		2.26.3
-Release:		1%{?dist}
+Release:		2%{?dist}
 Group:			Applications/Multimedia
 License:		CPL
 URL:			http://www.graphviz.org/
@@ -19,6 +19,7 @@ Patch2:			graphviz-2.26.0-doc-index-fix.patch
 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
@@ -210,6 +211,7 @@ Various tcl packages (extensions) for the graphviz tools.
 %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
@@ -416,6 +418,9 @@ fi
 
 
 %changelog
+* Fri Jan 21 2011 Karsten Hopp <karsten at redhat.com> 2.26.3-2
+- fix hack for powerpc-darwin8 in configure
+
 * 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)


More information about the scm-commits mailing list