From ff4418efcd0557d54a74ee5380ffad0b1ffff33db5df910ecd8a277593220eb9 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Sat, 31 May 2014 15:34:38 +0000 Subject: [PATCH] fix patches OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=88 --- graphviz-plugins-tcl_install_dir.patch | 4 ++-- graphviz-plugins.spec | 4 +--- graphviz-ppc64le_lib64_support.patch | 11 ----------- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 graphviz-ppc64le_lib64_support.patch diff --git a/graphviz-plugins-tcl_install_dir.patch b/graphviz-plugins-tcl_install_dir.patch index a8d0c3e..67abb30 100644 --- a/graphviz-plugins-tcl_install_dir.patch +++ b/graphviz-plugins-tcl_install_dir.patch @@ -23,7 +23,7 @@ Index: tclpkg/Makefile.in =================================================================== --- tclpkg/Makefile.in.orig 2013-09-07 03:11:21.000000000 +0200 +++ tclpkg/Makefile.in 2013-09-09 13:52:50.830269146 +0200 -@@ -522,8 +522,9 @@ pkgpython26dir = $(pkglibdir)/python26 +@@ -527,8 +527,9 @@ pkgpython26dir = $(pkglibdir)/python26 pkgpython27dir = $(pkglibdir)/python27 pkgRdir = $(pkglibdir)/R pkgrubydir = $(pkglibdir)/ruby @@ -34,4 +34,4 @@ Index: tclpkg/Makefile.in + @WITH_TCL_TRUE@pkgindex_DATA = pkgIndex.tcl SUBDIRS = tclstubs tkstubs tclhandle gdtclft tcldot tclpathplan tkspline gv - EXTRA_DIST = Makefile.old mkpkgindex.sh + EXTRA_DIST = mkpkgindex.sh diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 045bd56..e151424 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -34,12 +34,12 @@ BuildRequires: bison BuildRequires: flex BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ -BuildRequires: libgd-devel BuildRequires: ghostscript BuildRequires: gmp-devel BuildRequires: graphviz BuildRequires: guile-devel BuildRequires: libexpat-devel +BuildRequires: libgd-devel BuildRequires: libgnomeui-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -102,7 +102,6 @@ Patch103: graphviz-2.20.2-interpreter_names.patch Patch106: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code Patch108: graphviz-useless_warnings.patch -Patch109: graphviz-ppc64le_lib64_support.patch Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -274,7 +273,6 @@ Provides some additional PDF and HTML documentation for graphviz. %patch103 %patch106 %patch108 -%patch109 rm -f contrib/gprof2dot.awk # Fix path in generated man pages diff --git a/graphviz-ppc64le_lib64_support.patch b/graphviz-ppc64le_lib64_support.patch deleted file mode 100644 index 93d4dc0..0000000 --- a/graphviz-ppc64le_lib64_support.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -102,7 +102,7 @@ if test -z "$LIBPOSTFIX"; then - case "${host_os}" in - *linux* ) - case "${host_cpu}" in -- aarch64 | powerpc64 | s390x | x86_64 | sparc64 ) -+ aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 ) - LIBPOSTFIX="64" - ;; - esac