rpms/graphviz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix hack for powerpc-darwin8 in configure

Browse Source
This commit is contained in:
Karsten Hopp 2011-01-21 14:27:21 +01:00
parent 36b7ab18a3
commit c5eb0961f0
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphviz-2.26.3-ppc-darwinhack.patch Normal file
View File

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

7
graphviz.spec
View File

@ -4,7 +4,7 @@
Name: graphviz Name: graphviz
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
Version: 2.26.3 Version: 2.26.3
Release: 1%{?dist} Release: 2%{?dist}
Group: Applications/Multimedia Group: Applications/Multimedia
License: CPL License: CPL
URL: http://www.graphviz.org/ 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 Patch3: graphviz-2.26.0-testsuite-sigsegv-fix.patch
# Testsuite now do diff check also in case of err output (#645703). # Testsuite now do diff check also in case of err output (#645703).
Patch4: graphviz-2.26.0-rtest-errout-fix.patch 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 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 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 %patch2 -p1 -b .doc-index-fix
%patch3 -p1 -b .testsuite-sigsegv-fix %patch3 -p1 -b .testsuite-sigsegv-fix
%patch4 -p1 -b .rtest-errout-fix %patch4 -p1 -b .rtest-errout-fix
%patch5 -p1 -b .powerpc-darwin
%build %build
# %%define NO_IO --disable-io # %%define NO_IO --disable-io
@ -416,6 +418,9 @@ fi
%changelog %changelog
* Fri Jan 21 2011 Karsten Hopp <karsten@redhat.com> 2.26.3-2
- fix hack for powerpc-darwin8 in configure
* Thu Jan 06 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2.26.3-1 * Thu Jan 06 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2.26.3-1
- New version (#580017) - New version (#580017)
- Fixed gtk plugin program-name (#640671, gtk-progname patch) - Fixed gtk plugin program-name (#640671, gtk-progname patch)