diff --git a/graphviz-2.40.1-link.patch b/graphviz-link.patch similarity index 59% rename from graphviz-2.40.1-link.patch rename to graphviz-link.patch index b7a24fc..6ab6772 100644 --- a/graphviz-2.40.1-link.patch +++ b/graphviz-link.patch @@ -1,25 +1,14 @@ --- a/plugin/gtk/Makefile.am~ 2013-02-14 21:27:39.000000000 +0800 +++ b/plugin/gtk/Makefile.am 2013-05-27 11:22:45.127287033 +0800 -@@ -37,7 +37,7 @@ +@@ -30,7 +30,7 @@ libgvplugin_gtk_C_la_SOURCES = \ - libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ + libgvplugin_gtk_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO) libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES) -libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) +libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) -lX11 if WITH_WIN32 libgvplugin_gtk_la_LDFLAGS += -no-undefined ---- ./configure.ac.orig 2017-10-08 11:55:15.622878825 +0300 -+++ ./configure.ac 2017-10-08 11:56:08.642875683 +0300 -@@ -2775,7 +2775,7 @@ if test "x$use_gd" = "x"; then - AC_MSG_WARN(Optional GD library not available) - use_gd="No (library not found)" - with_libgd="no" -- ], $GD_LIBS) -+ ], $GDLIB_LIBS) - fi - LDFLAGS=$save_LDFLAGS - CPPFLAGS=$save_CPPFLAGS diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am index 58c88f4..e636cdc 100644 --- a/tclpkg/tcldot/Makefile.am @@ -28,7 +17,7 @@ index 58c88f4..e636cdc 100644 if WITH_LIBGD libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la --libtcldot_builtin_la_LIBADD += $(GD_LIBS) +-libtcldot_builtin_la_LIBADD += $(GDLIB_LIBS) +libtcldot_builtin_la_LIBADD += $(GDTCLFT_LIBS) $(GDLIB_LIBS) endif diff --git a/graphviz.spec b/graphviz.spec index 922ba3c..e2aafee 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -44,13 +44,13 @@ Summary: Graph visualization tools Name: graphviz -Version: 2.44.1 -Release: 3 +Version: 7.0.3 +Release: 1 License: Common Public License Group: Graphics Url: http://www.graphviz.org Source0: https://www2.graphviz.org/Packages/stable/portable_source/%{name}-%{version}.tar.gz -Patch0: graphviz-2.40.1-link.patch +Patch0: graphviz-link.patch BuildRequires: bison BuildRequires: flex BuildRequires: libtool @@ -250,21 +250,6 @@ This package provides the Python extension for %{name}. %files -n python3-graphviz %{_libdir}/graphviz/python3 %{py3_platsitedir}/* -#------------------------------------------------------------------------- - -%package -n %python2-graphviz -%py2_migration_meta %python2-graphviz -Summary: Graphviz bindings for python2 -Group: System/Libraries -Obsoletes: %{mklibname graphvizpython 0} < 2.28.0-4 -BuildRequires: pkgconfig(python2) - -%description -n %python2-graphviz -This package provides the Python extension for %{name}. - -%files -n %python2-graphviz -%{_libdir}/graphviz/python2 -%{py2_platsitedir}/* #------------------------------------------------------------------------- @@ -446,7 +431,7 @@ LUA_INSTALL_DIR=%{_libdir}/lua %endif --disable-guile \ --disable-python \ - --enable-python2 \ + --disable-python2 \ --enable-python3 \ --disable-sharp \ --with-pangocairo \ @@ -478,5 +463,4 @@ popd # fix documentation install -d -m 755 %{buildroot}%{_docdir} -mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name} mv %{buildroot}%{_datadir}/%{name}/demo %{buildroot}%{_docdir}/%{name}