Accepting request 64015 from graphics

Accepted submit request 64015 from user mrdocs

OBS-URL: https://build.opensuse.org/request/show/64015
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=42

graphviz-2.26.3-libtool24.patch

@@ -0,0 +1,99 @@
+See http://bugs.gentoo.org/339298
+
+Index: graphviz-2.26.3/configure.ac
+===================================================================
+--- graphviz-2.26.3.orig/configure.ac	2010-01-26 17:00:29.000000000 +0100
++++ graphviz-2.26.3/configure.ac	2011-03-11 13:22:25.525313743 +0100
+@@ -464,44 +464,17 @@ AC_REPLACE_FUNCS([strcasecmp strncasecmp
+ dnl -----------------------------------
+ dnl libtool ltdl on-demand plugin loading
+ 
+-m4_ifdef([LT_INIT],
+-    [ #code that is for Libtool 2.x
+-AM_PROG_LIBTOOL
+-    ],
+-    [ #code that is for 1.5.x
+-    ])
++LT_PREREQ([2.2.6])
++LT_INIT([dlopen])
+ AC_ARG_ENABLE(ltdl,
+   [AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])])
+ if test "x$enable_ltdl" != "xno"; then
+   AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading])
+-  AC_LIBTOOL_DLOPEN
+-m4_ifdef([LT_INIT],
+-    [ #code that is for Libtool 2.x
+-  LT_CONFIG_LTDL_DIR([libltdl])
+-  LTDL_INIT
+-    ],
+-    [ #code that is for 1.5.x
+-  AC_CONFIG_SUBDIRS([libltdl])
+-    ])
+   use_ltdl="Yes"
+-  
+-  AC_LIBLTDL_CONVENIENCE
+-  if test "x$DARWIN9" = "xyes"; then
+-     LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*"
+-  fi
+ else
+   use_ltdl="No (disabled)"
+ fi
+ AM_CONDITIONAL(ENABLE_LTDL, [test "x$enable_ltdl" != "xno"])
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
+-AC_SUBST(LIBLTDL_LDFLAGS)
+-m4_ifdef([LT_INIT],
+-    [ #code that is for Libtool 2.x
+-    ],
+-    [ #code that is for 1.5.x
+-AM_PROG_LIBTOOL
+-    ])
+ 
+ # Checks for libraries.
+ #AC_CHECK_LIB([ICE], [main])
+Index: graphviz-2.26.3/lib/gvc/gvcext.h
+===================================================================
+--- graphviz-2.26.3.orig/lib/gvc/gvcext.h	2009-07-08 17:14:20.000000000 +0200
++++ graphviz-2.26.3/lib/gvc/gvcext.h	2011-03-11 13:23:13.753417211 +0100
+@@ -58,6 +58,7 @@ extern "C" {
+     typedef struct GVJ_s GVJ_t;
+     typedef struct GVC_s GVC_t;
+ 
++
+     typedef struct {
+ 	const char *name;
+ 	void* address;
+@@ -80,9 +81,11 @@ __declspec(dllexport) lt_symlist_t lt_pr
+ #if defined(GVDLL)
+ 	__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
+ #else
++#if !defined(LTDL_H)
+ 	extern lt_symlist_t lt_preloaded_symbols[];
+ #endif
+ #endif
++#endif
+ 
+ 
+ #ifdef __cplusplus
+Index: graphviz-2.26.3/lib/gvc/Makefile.am
+===================================================================
+--- graphviz-2.26.3.orig/lib/gvc/Makefile.am	2009-08-28 21:46:42.000000000 +0200
++++ graphviz-2.26.3/lib/gvc/Makefile.am	2011-03-11 13:22:25.526313858 +0100
+@@ -18,7 +18,6 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/lib/pathplan \
+ 	-I$(top_srcdir)/lib/$(GRAPH) \
+ 	-I$(top_srcdir)/lib/cdt \
+-	$(INCLTDL) -I$(top_srcdir)/libltdl \
+ 	-DGVLIBDIR=\"$(pkglibdir)\"
+ 
+ if WITH_WIN32
+@@ -55,8 +54,7 @@ libgvc_C_la_LIBADD += $(top_builddir)/li
+ libgvc_C_la_DEPENDENCIES +=  $(top_builddir)/lib/ortho/libortho_C.la
+ endif
+ if ENABLE_LTDL
+-libgvc_C_la_LIBADD += $(LIBLTDL) $(LIBLTDL_LDFLAGS)
+-libgvc_C_la_DEPENDENCIES += $(LIBLTDL)
++libgvc_C_la_LIBADD += -lltdl
+ endif
+ 
+ libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined

graphviz-plugins.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 11 12:25:36 UTC 2011 - coolo@novell.com
+
+- fix conflict with libltdl (http://bugs.gentoo.org/339298)
+
 -------------------------------------------------------------------
 Fri Jun 18 15:02:39 CEST 2010 - pth@suse.de
 

graphviz-plugins.spec

@@ -43,6 +43,8 @@ Patch13:        graphviz-stddefs.patch
 Patch14:        graphviz-gd_png_check_sig.patch
 Patch15:        graphviz-wrong_index.patch
 Patch16:        graphviz-sequence_point.patch
+# PATCH-UPSTREAM see http://bugs.gentoo.org/339298
+Patch17:        graphviz-2.26.3-libtool24.patch
 #Patches above 100 are graphviz-plugins specific.
 Patch100:       graphviz-plugins-fix_install_dirs.patch
 Patch101:       graphviz-plugins-tcl_install_dir.patch
@@ -65,18 +67,6 @@ PreReq:         coreutils
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in bar charts).
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-gnome
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -89,18 +79,6 @@ Requires:       xorg-x11-fonts
 %description -n graphviz-gnome
 Graphviz plugins that use gtk/GNOME.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-gd
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -113,18 +91,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-gd package contains the gd extensions for the graphviz
 tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-guile
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -136,18 +102,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in bar charts).
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-java
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -159,18 +113,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in bar charts).
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-lua
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -182,18 +124,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-lua package contains the lua extension for the graphviz
 tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-ocaml
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -205,18 +135,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-ocaml package contains the Objective Caml extension for
 the graphviz tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-perl
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -229,18 +147,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-perl package contains the Perl extension for the graphviz
 tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-php
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -252,18 +158,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-php package contains the PHP extension for the graphviz
 tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-python
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -275,18 +169,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-python package contains the Python extension for the
 graphviz tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-ruby
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -298,18 +180,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-ruby package contains the ruby extension for the graphviz
 tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-sharp
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -321,18 +191,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-sharp package contains the C# extension for the graphviz
 tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-tcl
 License:        IBM Public License ..
 Group:          Development/Libraries/Tcl
@@ -344,18 +202,6 @@ Provides:       graphviz_plugin = %{version}-%{release}
 The graphviz-tcl package contains the various tcl packages (extensions)
 for the graphviz tools.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package -n graphviz-doc
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
@@ -364,18 +210,6 @@ Summary:        Documentation for graphviz
 %description -n graphviz-doc
 Provides some additional PDF and HTML documentation for graphviz.
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %prep
 %setup -q -n %{mname}-%{version}
 %patch0
@@ -385,6 +219,7 @@ Authors:
 %patch14
 %patch15
 %patch16
+%patch17 -p1
 %patch100
 %patch101
 %patch103

graphviz.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 11 12:25:36 UTC 2011 - coolo@novell.com
+
+- fix conflict with libltdl (http://bugs.gentoo.org/339298)
+
 -------------------------------------------------------------------
 Fri Jun 18 09:15:07 UTC 2010 - coolo@novell.com
 

graphviz.spec

@@ -21,10 +21,12 @@
 
 Name:           graphviz
 BuildRequires:  fdupes libexpat-devel libjpeg-devel libpng-devel zlib-devel
-BuildRequires:  freetype2-devel >= 2 gcc-c++ libstdc++-devel
+BuildRequires:  freetype2-devel >= 2 
+BuildRequires:  gcc-c++ libstdc++-devel
 BuildRequires:  bison flex glib2-devel xorg-x11-devel
 BuildRequires:  xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
 BuildRequires:  xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
+BuildRequires:  libtool
 PreReq:         /bin/rm
 Version:        2.26.3
 Release:        6
@@ -40,6 +42,8 @@ Patch13:        graphviz-stddefs.patch
 Patch14:        graphviz-gd_png_check_sig.patch
 Patch15:        graphviz-wrong_index.patch
 Patch16:        graphviz-sequence_point.patch
+# PATCH-UPSTREAM see http://bugs.gentoo.org/339298
+Patch17:        graphviz-2.26.3-libtool24.patch
 Url:            http://www.graphviz.org/
 License:        IBM Public License ..
 Prefix:         /usr
@@ -52,18 +56,6 @@ Recommends:     graphviz-gd = %{version}
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in bar charts).
 
-
-
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %package devel
 License:        IBM Public License ..
 Group:          Development/Libraries/C and C++
@@ -80,16 +72,6 @@ programs that use the graphviz libraries including man3 pages.
 Note: If you need output in png format you also need to install
       graphviz-gnome.
 
-Authors:
---------
-    David Dobkin <dpd@cs.princeton.edu>
-    John Ellson  <ellson@graphviz.org>
-    Emden Gansner <erg@research.att.com>
-    Eleftherios Koutsofios <ek@research.att.com>
-    Stephen North <north@research.att.com>
-    Kiem-Phong Vo <kpv@research.att.com>
-    Gordon Woodhull <gmcw@worldnet.att.net>
-
 %prep
 %setup -q
 %patch0
@@ -99,6 +81,7 @@ Authors:
 %patch14
 %patch15
 %patch16
+%patch17 -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