From 4c9dbf1b63db331cd2b41ac149c90debc09c2ce3195221d1676bbce6ba604ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 29 Sep 2011 14:42:35 +0000 Subject: [PATCH 1/3] Remove Prefix OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=31 --- graphviz-plugins.spec | 2 +- graphviz.spec | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 6ece65b..a808187 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -80,7 +80,7 @@ Patch105: graphviz-2.18-do_not_use_ocamlopt.patch Patch106: graphviz-fix-pkgIndex.patch Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build -Prefix: /usr + %define rb_libdir %{_libdir}/ruby %define rb_sitedir %{rb_libdir}/site_ruby/%{rb_ver} %define rb_vendordir %{rb_libdir}/vendor_ruby/%{rb_ver} diff --git a/graphviz.spec b/graphviz.spec index 9378f81..22f8cb9 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -55,7 +55,6 @@ Requires(pre): /bin/rm Recommends: graphviz-gd = %{version} Recommends: graphviz-gnome = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Prefix: /usr %description A collection of tools and tcl packages for the manipulation and layout From ffa1f11af6a885be478252711d56094c1eb64ccb58e9fa988c6974b07aefd12a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 3 Oct 2011 12:28:31 +0000 Subject: [PATCH 2/3] Accepting request 86246 from home:coolo:branches:openSUSE:Factory - disable GD plugin completely OBS-URL: https://build.opensuse.org/request/show/86246 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=34 --- graphviz-plugins.spec | 1 + graphviz.changes | 5 +++++ graphviz.spec | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index a808187..5d0bc4a 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -276,6 +276,7 @@ export CPPFLAGS="%{optflags}" --disable-dependency-tracking \ --with-ipsepcola \ --without-ming \ + --disable-silent-rules \ --enable-ltdl-install=no \ --disable-io make DESTDIR=%{buildroot} %{?_smp_mflags} diff --git a/graphviz.changes b/graphviz.changes index b8e5546..81027b9 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 3 11:53:27 UTC 2011 - coolo@suse.com + +- disable GD plugin completely + ------------------------------------------------------------------- Wed Sep 28 19:08:30 UTC 2011 - idonmez@suse.com diff --git a/graphviz.spec b/graphviz.spec index 22f8cb9..19252c6 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -109,7 +109,10 @@ export CPPFLAGS="%{optflags}" --enable-ltdl-install=no \ --with-ipsepcola \ --without-ming \ - --disable-io + --disable-io \ + --disable-silent-rules \ + --with-mylibgd=no \ + --with-libgd=no make %{?_smp_mflags} DESTDIR=%{buildroot} %install From be906b1647766b855895622f1ec1d67b3374887ebf9cb8e7a95e75c730032524 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 3 Oct 2011 13:56:13 +0000 Subject: [PATCH 3/3] - fix compilation of yast2-qt-graph OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=35 --- fix-headers.diff | 24 ++++++++++++++++++++++++ graphviz.changes | 5 +++++ graphviz.spec | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 fix-headers.diff diff --git a/fix-headers.diff b/fix-headers.diff new file mode 100644 index 0000000..0c1b9b3 --- /dev/null +++ b/fix-headers.diff @@ -0,0 +1,24 @@ +Index: graphviz-2.28.0/lib/cdt/cdt.h +=================================================================== +--- graphviz-2.28.0.orig/lib/cdt/cdt.h 2010-04-26 20:35:08.000000000 +0200 ++++ graphviz-2.28.0/lib/cdt/cdt.h 2011-10-03 15:47:24.632084472 +0200 +@@ -17,6 +17,7 @@ + #endif + + #include /* size_t */ ++#include + + #ifndef _BEGIN_EXTERNS_ + #define _BEGIN_EXTERNS_ +@@ -238,11 +239,6 @@ extern int dtsize _ARG_((Dt_t*)); + extern int dtstat _ARG_((Dt_t*, Dtstat_t*, int)); + extern unsigned int dtstrhash _ARG_((unsigned int, Void_t*, int)); + +-#if !_PACKAGE_ast +-extern int memcmp _ARG_((const Void_t*, const Void_t*, size_t)); +-extern int strcmp _ARG_((const char*, const char*)); +-#endif +- + #undef extern + _END_EXTERNS_ + diff --git a/graphviz.changes b/graphviz.changes index 81027b9..e02f2cd 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 3 13:55:01 UTC 2011 - coolo@suse.com + +- fix compilation of yast2-qt-graph + ------------------------------------------------------------------- Mon Oct 3 11:53:27 UTC 2011 - coolo@suse.com diff --git a/graphviz.spec b/graphviz.spec index 19252c6..68752a1 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -30,6 +30,7 @@ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}. Source2: graphviz-rpmlintrc Patch1: graphviz-gd_png_check_sig.patch Patch2: graphviz-fix-pkgIndex.patch +Patch3: fix-headers.diff BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -89,6 +90,7 @@ Note: If you need output in png format you also need to install %setup -q %patch1 %patch2 +%patch3 -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