From ee4bcf683c94a658d576322d07335d6aea424e721fd1fe476bd544c629385f90 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Fri, 28 May 2010 14:34:30 +0000 Subject: [PATCH] Accepting request 40800 from home:msmeissn:branches:graphics Copy from home:msmeissn:branches:graphics/graphviz via accept of submit request 40800 revision 2. Request was accepted with message: Reviewed OK OBS-URL: https://build.opensuse.org/request/show/40800 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=14 --- graphviz-plugins.changes | 5 +++++ graphviz-plugins.spec | 2 ++ graphviz-ruby-ppc.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 graphviz-ruby-ppc.patch diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index ee49993..afbbd11 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 28 15:15:48 CEST 2010 - meissner@suse.de + +- remove a powerpc hack for Darwin that failed our PowerPC build. + ------------------------------------------------------------------- Fri Nov 13 23:37:02 CET 2009 - dmueller@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 5f1e94a..a330c29 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -45,6 +45,7 @@ Patch100: graphviz-plugins-fix_install_dirs.patch Patch101: graphviz-plugins-tcl_install_dir.patch Patch103: graphviz-2.18-do_not_use_ocamlopt.patch Patch104: python-version.diff +Patch105: graphviz-ruby-ppc.patch Url: http://www.graphviz.org/ License: IBM Public License .. Prefix: /usr @@ -380,6 +381,7 @@ Authors: %patch101 %patch103 %patch104 +%patch105 -p1 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl # remove broken macros diff --git a/graphviz-ruby-ppc.patch b/graphviz-ruby-ppc.patch new file mode 100644 index 0000000..f2b52e2 --- /dev/null +++ b/graphviz-ruby-ppc.patch @@ -0,0 +1,26 @@ +Index: graphviz-2.26.3/configure.ac +=================================================================== +--- graphviz-2.26.3.orig/configure.ac ++++ graphviz-2.26.3/configure.ac +@@ -1405,8 +1405,6 @@ else + use_ruby="No (ruby not available)" + 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/'` + 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 +Index: graphviz-2.26.3/configure +=================================================================== +--- graphviz-2.26.3.orig/configure ++++ graphviz-2.26.3/configure +@@ -27575,8 +27575,6 @@ fi + use_ruby="No (ruby not available)" + 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/'` + 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