Updated CVE-2019-11023 patch

Related: CVE-2019-11023

.gitignore

@@ -1 +1 @@
-/graphviz-*.tar.bz2
+graphviz-*.tar.gz

graphviz-2.40.1-CVE-2018-10196.patch

@@ -0,0 +1,16 @@
+diff --git a/lib/dotgen/conc.c b/lib/dotgen/conc.c
+--- a/lib/dotgen/conc.c
++++ b/lib/dotgen/conc.c
+@@ -159,7 +159,11 @@ static void rebuild_vlists(graph_t * g)
+ 
+     for (r = GD_minrank(g); r <= GD_maxrank(g); r++) {
+ 	lead = GD_rankleader(g)[r];
+-	if (GD_rank(dot_root(g))[r].v[ND_order(lead)] != lead) {
++	if (lead == NULL) {
++		agerr(AGERR, "rebuiltd_vlists: lead is null for rank %d\n", r);
++		longjmp(jbuf, 1);
++	}
++	else if (GD_rank(dot_root(g))[r].v[ND_order(lead)] != lead) {
+ 	    agerr(AGERR, "rebuiltd_vlists: rank lead %s not in order %d of rank %d\n", 
+ 		agnameof(lead), ND_order(lead), r);
+ 	    longjmp(jbuf, 1);

graphviz-2.40.1-CVE-2019-11023.patch

@@ -0,0 +1,77 @@
+diff --git a/cmd/tools/graphml2gv.c b/cmd/tools/graphml2gv.c
+index 7b8214b..0910d99 100644
+--- a/cmd/tools/graphml2gv.c
++++ b/cmd/tools/graphml2gv.c
+@@ -477,8 +477,10 @@ startElementHandler(void *userData, const char *name, const char **atts)
+ 	if (pos > 0) {
+ 	    const char *attrname;
+ 	    attrname = atts[pos];
+-
+-	    bind_node(attrname);
++            if (G == 0)
++                fprintf(stderr,"node %s outside graph, ignored\n",attrname);
++	    else
++                bind_node(attrname);
+ 
+ 	    pushString(&ud->elements, attrname);
+ 	}
+@@ -504,21 +506,25 @@ startElementHandler(void *userData, const char *name, const char **atts)
+ 	if (tname)
+ 	    head = tname;
+ 
+-	bind_edge(tail, head);
++        if (G == 0)
++            fprintf(stderr,"edge source %s target %s outside graph, ignored\n",(char*)tail,(char*)head);
++        else {
++            bind_edge(tail, head);
+ 
+-	t = AGTAIL(E);
+-	tname = agnameof(t);
++            t = AGTAIL(E);
++	    tname = agnameof(t);
+ 
+-	if (strcmp(tname, tail) == 0) {
+-	    ud->edgeinverted = FALSE;
+-	} else if (strcmp(tname, head) == 0) {
+-	    ud->edgeinverted = TRUE;
+-	}
++	    if (strcmp(tname, tail) == 0) {
++	        ud->edgeinverted = FALSE;
++	    } else if (strcmp(tname, head) == 0) {
++	        ud->edgeinverted = TRUE;
++	    }
+ 
+-	pos = get_xml_attr("id", atts);
+-	if (pos > 0) {
+-	    setEdgeAttr(E, GRAPHML_ID, (char *) atts[pos], ud);
+-	}
++	    pos = get_xml_attr("id", atts);
++	    if (pos > 0) {
++	        setEdgeAttr(E, GRAPHML_ID, (char *) atts[pos], ud);
++	    }
++        }
+     } else {
+ 	/* must be some extension */
+ 	fprintf(stderr,
+@@ -539,7 +545,7 @@ static void endElementHandler(void *userData, const char *name)
+ 	char *ele_name = topString(ud->elements);
+ 	if (ud->closedElementType == TAG_GRAPH) {
+ 	    Agnode_t *node = agnode(root, ele_name, 0);
+-	    agdelete(root, node);
++	    if (node) agdelete(root, node);
+ 	}
+ 	popString(&ud->elements);
+ 	Current_class = TAG_GRAPH;
+diff --git a/lib/cgraph/obj.c b/lib/cgraph/obj.c
+index 7b1c8c1..709774e 100644
+--- a/lib/cgraph/obj.c
++++ b/lib/cgraph/obj.c
+@@ -168,6 +168,8 @@ void agdelcb(Agraph_t * g, void *obj, Agcbstack_t * cbstack)
+ 
+ Agraph_t *agroot(void* obj)
+ {
++    // fixes CVE-2019-11023 by moving the problem to the caller :-)
++    if (obj == 0) return NILgraph;
+     switch (AGTYPE(obj)) {
+     case AGINEDGE:
+     case AGOUTEDGE:

graphviz-2.40.1-dotty-menu-fix.patch

@@ -0,0 +1,22 @@
+diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
+index a8c9116..a708c61 100644
+--- a/cmd/dotty/dotty_ui.lefty
++++ b/cmd/dotty/dotty_ui.lefty
+@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [
+         else
+             gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
+     };
+-    'rightdown' = function (data) {
++    'rightup' = function (data) {
+         local vt, gt, menu, i;
+ 
+         vt = dotty.views[data.widget];
+@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [
+     'middledown' = dotty.protovt.normal.uifuncs.middledown;
+     'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
+     'middleup' = dotty.protovt.normal.uifuncs.middleup;
+-    'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
++    'rightup' = dotty.protovt.normal.uifuncs.rightup;
+     'keyup' = dotty.protovt.normal.uifuncs.keyup;
+     'redraw' = dotty.protovt.normal.uifuncs.redraw;
+     'closeview' = dotty.protovt.normal.uifuncs.closeview;

graphviz-2.40.1-python3.patch

@@ -0,0 +1,58 @@
+diff --git a/config/config_python.py b/config/config_python.py
+index b747045..2b1ac8d 100644
+--- a/config/config_python.py
++++ b/config/config_python.py
+@@ -1,12 +1,13 @@
++from __future__ import print_function
++
+ import sys
+ from distutils import sysconfig
+ 
+ if sys.argv[1] == "archlib":
+-    print sysconfig.get_python_lib(1,1)
++    print(sysconfig.get_python_lib(1,1))
+ elif sys.argv[1] == "lib":
+-    print sysconfig.get_python_lib(0,1)
++    print(sysconfig.get_python_lib(0,1))
+ elif sys.argv[1] == "archsitelib":
+-    print sysconfig.get_python_lib(1,0)
++    print(sysconfig.get_python_lib(1,0))
+ elif sys.argv[1] == "sitelib":
+-    print sysconfig.get_python_lib(0,0)
+-
++    print(sysconfig.get_python_lib(0,0))
+diff --git a/configure.ac b/configure.ac
+index 51166c3..4d8c9a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1142,7 +1142,7 @@ else
+     if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
+       use_python="No (swig does not support -python option)"
+     else
+-      AC_CHECK_PROG(PYTHON,python,python)
++      AC_CHECK_PROGS(PYTHON,[python3 python])
+       if test "x$PYTHON" = "x"; then
+         use_python="No (python not available)"
+       else
+@@ -1167,8 +1167,11 @@ else
+       if test "x$PYTHON" = "x"; then
+ 	use_python="No (python is too old)"
+       else
+-        PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
++        PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
+         PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
++        if test $PYTHON_VERSION_MAJOR -gt 2; then
++          PYTHON_INCLUDES="${PYTHON_INCLUDES}m"
++        fi
+ #        PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
+ 	PYTHON_LIBS="-undefined dynamic_lookup"
+         PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
+@@ -1548,7 +1551,7 @@ else
+       if test "x$PYTHON34" = "x"; then
+ 	    use_python34="No (python34 is too old)"
+       else
+-        PYTHON34_PREFIX=`$PYTHON3 -c "import sys; print sys.prefix"`
++        PYTHON34_PREFIX=`$PYTHON3 -c "import sys; print(sys.prefix)"`
+ #        PYTHON34_INCLUDES=-I$PYTHON34_PREFIX/include/python$PYTHON34_VERSION_SHORT
+ # FIXME - whats the stupid "m" for?
+         PYTHON34_INCLUDES=-I/usr/include/python3.4m

graphviz-2.40.1-visio.patch

@@ -0,0 +1,25 @@
+diff --git a/plugin/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp
+index 303eac0..14e377c 100644
+--- a/plugin/visio/VisioGraphic.cpp
++++ b/plugin/visio/VisioGraphic.cpp
+@@ -29,6 +29,8 @@
+ #define isfinite(x) finite(x)
+ #endif
+ 
++#include <cstdlib>
++
+ #include "VisioGraphic.h"
+ 
+ #include "gvcjob.h"
+diff --git a/plugin/visio/VisioText.cpp b/plugin/visio/VisioText.cpp
+index 635806c..3c6441a 100644
+--- a/plugin/visio/VisioText.cpp
++++ b/plugin/visio/VisioText.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "gvcjob.h"
+ #include "gvio.h"
++#include <cstdlib>
+ #include <string.h>
+ 
+ extern "C" char *xml_string(char* str);

graphviz-4.0.0-gvpack-neato-static.patch

@@ -1,15 +0,0 @@
-diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
-index 4978fea..9fbe2e2 100644
---- a/cmd/tools/Makefile.am
-+++ b/cmd/tools/Makefile.am
-@@ -249,7 +249,9 @@ gvpack_LDADD = \
- 	$(top_builddir)/lib/ingraphs/libingraphs_C.la \
- 	$(top_builddir)/lib/cgraph/libcgraph.la \
- 	$(top_builddir)/lib/cdt/libcdt.la \
--	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la
-+	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
-+	$(top_builddir)/lib/pathplan/libpathplan_C.la \
-+		$(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
- 
- if ENABLE_STATIC
- gvpack_static_SOURCES = gvpack.cpp

graphviz-7.0.6-fix-python-3.12.patch

@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 49e027f..542c23a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1141,7 +1141,7 @@ else
- 	           use_python3="No (python-$PYTHON3_VERSION.pc not found)"
-           fi
-         fi
--        PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(1,0))'`"
-+        PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'import sysconfig; print(sysconfig.get_path("platlib"))'`"
-         save_CPPFLAGS=$CPPFLAGS
-         CPPFLAGS="$CPPFLAGS $PYTHON3_INCLUDES"
-         AC_CHECK_HEADER(Python.h,,[

graphviz.spec

@@ -1,24 +1,9 @@
-%undefine _package_note_flags
+%if 0%{?rhel} == 8
-%if 0%{?rhel} >= 8
-%bcond_with php
-%bcond_with guile
-%else
-# temporal drop of PHP support due to https://gitlab.com/graphviz/graphviz/-/issues/2277
-%bcond_with php
-%bcond_without guile
-%endif
 %bcond_with python2
-
+%bcond_with php
-# Macro for creating an option which enables bootstraping build without dependencies,
-# which cause problems during rebuilds. Currently it is circular dependency of graphviz and
-# doxygen - in case a dependency of graphviz/doxygen bumps SONAME and graphviz/doxygen
-# has to be rebuilt, we can break the circular dependency by building with --with bootstrap.
-%bcond_with bootstrap
-
-%if 0%{?rhel} >= 10
-%bcond_with gtk2
 %else
-%bcond_without gtk2
+%bcond_without python2
+%bcond_without php
 %endif
 
 # Necessary conditionals
@@ -43,12 +28,6 @@
 # Not in Fedora yet.
 %global MING   0
 
-%ifarch %{java_arches}
-%global JAVA 1
-%else
-%global JAVA 0
-%endif
-
 %if 0%{?rhel}
 %global SHARP  0
 %global ARRRR  0
@@ -63,18 +42,6 @@
 %global PHP 0
 %endif
 
-%if %{with guile}
-%global GUILE 1
-%else
-%global GUILE 0
-%endif
-
-%ifarch %{golang_arches}
-%global GOLANG 1
-%else
-%global GOLANG 0
-%endif
-
 # Plugins version
 %global pluginsver 6
 
@@ -93,58 +60,28 @@
 
 Name:			graphviz
 Summary:		Graph Visualization Tools
-Version:		7.1.0
+Version:		2.40.1
-Release:		2%{?dist}
+Release:		39%{?dist}
-License:		EPL-1.0
+License:		EPL
 URL:			http://www.graphviz.org/
-Source0:		https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
+# A bit hacking needed due to: https://gitlab.com/graphviz/graphviz/issues/1371
-BuildRequires:		gcc-g++
+Source0:		https://gitlab.com/graphviz/graphviz/-/archive/stable_release_%{version}/graphviz-stable_release_%{version}.tar.gz #/graphviz-2.40.1.tar.gz
-BuildRequires:		zlib-devel
+Patch0:			graphviz-2.40.1-visio.patch
-BuildRequires:		libpng-devel
+Patch1:			graphviz-2.40.1-python3.patch
-BuildRequires:		libjpeg-devel
+# https://gitlab.com/graphviz/graphviz/issues/1367
-BuildRequires:		expat-devel
+Patch2:			graphviz-2.40.1-CVE-2018-10196.patch
-BuildRequires:		freetype-devel >= 2
+# rhbz#1505230
-BuildRequires:		ksh
+Patch3:			graphviz-2.40.1-dotty-menu-fix.patch
-BuildRequires:		bison
+Patch5:			graphviz-2.40.1-CVE-2019-11023.patch
-BuildRequires:		m4
+BuildRequires:		zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
-BuildRequires:		flex
+BuildRequires:		ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
-BuildRequires:		tk-devel
+BuildRequires:		fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel
-BuildRequires:		tcl-devel >= 8.3
-BuildRequires:		swig
-BuildRequires:		sed
-BuildRequires:		fontconfig-devel
-BuildRequires:		libtool-ltdl-devel
-BuildRequires:		ruby-devel
-BuildRequires:		ruby
-BuildRequires:		libXt-devel
-BuildRequires:		libXmu-devel
-%if %{GUILE}
-BuildRequires:		guile22-devel
-%endif
 %if %{with python2}
 BuildRequires:		python2-devel
 %endif
-BuildRequires:		python3-devel
+BuildRequires:		python3-devel, libXaw-devel, libSM-devel, libXext-devel, java-devel
-BuildRequires:		libXaw-devel
+BuildRequires:		cairo-devel >= 1.1.10, pango-devel, gmp-devel, lua-devel, gtk2-devel
-BuildRequires:		libSM-devel
+BuildRequires:		gd-devel, perl-devel, swig >= 1.3.33, automake, autoconf, libtool, qpdf
-BuildRequires:		libXext-devel
-%if %{JAVA}
-BuildRequires:		java-devel
-%endif
-BuildRequires:		cairo-devel >= 1.1.10
-BuildRequires:		pango-devel
-BuildRequires:		gmp-devel
-BuildRequires:		lua-devel
-%if %{with gtk2}
-BuildRequires:		gtk2-devel
-%endif
-BuildRequires:		gd-devel
-BuildRequires:		perl-devel
-BuildRequires:		swig >= 1.3.33
-BuildRequires:		automake
-BuildRequires:		autoconf
-BuildRequires:		libtool
-BuildRequires:		qpdf
 # Temporary workaound for perl(Carp) not pulled
 BuildRequires:		perl-Carp
 %if %{PHP}
@@ -171,37 +108,14 @@ BuildRequires:		gts-devel
 %if %{LASI}
 BuildRequires:		lasi-devel
 %endif
-BuildRequires:		urw-base35-fonts
+BuildRequires:		urw-base35-fonts, perl-ExtUtils-Embed, perl-generators, librsvg2-devel
-BuildRequires:		perl-ExtUtils-Embed
-BuildRequires:		perl-generators
-BuildRequires:		librsvg2-devel
 # for ps2pdf
 BuildRequires:		ghostscript
 BuildRequires:		libgs-devel
-BuildRequires:		make
-BuildRequires:		poppler-glib-devel
-BuildRequires:		freeglut-devel
-BuildRequires:		libglade2-devel
-BuildRequires:		gtkglext-devel
-%if %{without bootstrap}
-BuildRequires:		doxygen
-%endif
-%if %{GOLANG}
-BuildRequires:		golang
-%endif
 # ISO8859-1 fonts are required by lefty
-Requires:		urw-base35-fonts
+Requires:		urw-base35-fonts, xorg-x11-fonts-ISO8859-1-100dpi
-Requires:		xorg-x11-fonts-ISO8859-1-100dpi
 Requires(post):		/sbin/ldconfig
 Requires(postun):	/sbin/ldconfig
-# rhbz#1838679
-Patch0:			graphviz-4.0.0-gvpack-neato-static.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=2155048
-Patch1:			graphviz-7.0.6-fix-python-3.12.patch
-
-%if ! %{JAVA}
-Obsoletes:              graphviz-java < %{version}-%{release}
-%endif
 
 %description
 A collection of tools for the manipulation and layout of graphs (as in nodes
@@ -234,14 +148,6 @@ Summary:		PDF and HTML documents for graphviz
 %description doc
 Provides some additional PDF and HTML documentation for graphviz.
 
-%if %{GTS}
-%package smyrna
-Summary:		Graphviz interactive graph viewer
-
-%description smyrna
-Smyrna is a viewer for graphs in the DOT format.
-%endif
-
 %package gd
 Summary:		Graphviz plugin for renderers based on gd
 Requires:		%{name} = %{version}-%{release}
@@ -253,40 +159,25 @@ Graphviz plugin for renderers based on gd.  (Unless you absolutely have to use
 GIF, you are recommended to use the PNG format instead because of the better
 quality anti-aliased lines provided by the cairo+pango based renderer.)
 
-%if %{with gtk2}
-%package gtk2
-Summary:		Graphviz plugin for renderers based on gtk2
-Requires:		%{name} = %{version}-%{release}
-Requires(post):		%{_bindir}/dot /sbin/ldconfig
-Requires(postun):	%{_bindir}/dot /sbin/ldconfig
-
-%description gtk2
-Graphviz plugin for renderers based on gtk2.
-%endif
-
 %package graphs
 Summary:		Demo graphs for graphviz
 
 %description graphs
 Some demo graphs for graphviz.
 
-%if %{GUILE}
 %package guile
 Summary:		Guile extension for graphviz
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{version}-%{release}, guile
 
 %description guile
 Guile extension for graphviz.
-%endif
 
-%if %{JAVA}
 %package java
 Summary:		Java extension for graphviz
 Requires:		%{name} = %{version}-%{release}
 
 %description java
 Java extension for graphviz.
-%endif
 
 %package lua
 Summary:		Lua extension for graphviz
@@ -316,6 +207,7 @@ Ocaml extension for graphviz.
 %package perl
 Summary:		Perl extension for graphviz
 Requires:		%{name} = %{version}-%{release}
+Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Perl extension for graphviz.
@@ -390,28 +282,22 @@ Requires:		%{name} = %{version}-%{release}, tcl >= 8.3, tk
 %description tcl
 Various tcl packages (extensions) for the graphviz tools.
 
-%if %{GOLANG}
-%package go
-Summary:		Go extension for graphviz
-Requires:		%{name} = %{version}-%{release}, golang
-
-%description go
-Go extension for graphviz.
-%endif
-
 %prep
-%autosetup -p1
+%setup -q -n graphviz-stable_release_%{version}
+%patch0 -p1 -b .visio
+%patch1 -p1 -b .python3
+%patch2 -p1 -b .CVE-2018-10196
+%patch3 -p1 -b .dotty-menu-fix
+%patch5 -p1 -b .CVE-2019-11023
 
 # Attempt to fix rpmlint warnings about executable sources
 find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
 
 %build
 ./autogen.sh
-%if %{JAVA}
 # Hack in the java includes we need
 sed -i '/JavaVM.framework/!s/JAVA_INCLUDES=/JAVA_INCLUDES=\"_MY_JAVA_INCLUDES_\"/g' configure
 sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linux/|g' configure
-%endif
 # Rewrite config_ruby.rb to work with Ruby 2.2
 sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb
 sed -i 's|sitearchdir|vendorarchdir|' config/config_ruby.rb
@@ -419,11 +305,8 @@ sed -i 's|sitearchdir|vendorarchdir|' config/config_ruby.rb
 # get the path to search for ruby/config.h to CPPFLAGS, so that configure can find it
 export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbConfig::CONFIG['sitearch'])" || echo /dev/null`
 %configure --with-x --disable-static --disable-dependency-tracking \
-%if ! %{JAVA}
---enable-java=no \
-%endif
 	--without-mylibgd --with-ipsepcola --with-pangocairo \
-	--with-gdk-pixbuf --with-visio --disable-silent-rules --enable-lefty \
+	--with-gdk-pixbuf --with-visio --disable-silent-rules \
 %if ! %{LASI}
 	--without-lasi \
 %endif
@@ -448,32 +331,39 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon
 %if ! %{QTAPPS}
 	--without-qt \
 %endif
-%if %{GUILE}
+
-	--enable-guile=yes \
+%if %{with python2}
-%else
+cp -a tclpkg/gv tclpkg/gv.python2
-	--enable-guile=no \
-%endif
-%if %{GOLANG}
-	--enable-go=yes
-%else
-	--enable-go=no
 %endif
 
-# drop rpath
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+  CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+  PYTHON_INCLUDES=-I/usr/include/python%{python3_version}m PYTHON_LIBS="-lpython%{python3_version}m" \
+  PYTHON_INSTALL_DIR=%{python3_sitearch} PYTHON=%{__python3}
 
-%make_build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
+%if %{with python2}
-  CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}"
+pushd tclpkg/gv.python2
-
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
-%if %{without bootstrap}
+  CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
-make doxygen
+  PYTHON_INCLUDES=-I/usr/include/python%{python2_version} PYTHON_LIBS="-lpython%{python2_version}" \
+  PYTHON_INSTALL_DIR=%{python2_sitearch} libgv_python.la
+popd
 %endif
 
 %install
-%make_install docdir=%{_docdir}/%{name} \
+rm -rf %{buildroot}
-	pkgconfigdir=%{_libdir}/pkgconfig
+make DESTDIR=%{buildroot} \
+	docdir=%{buildroot}%{_docdir}/%{name} \
+	pkgconfigdir=%{_libdir}/pkgconfig \
+	PYTHON_LIBS="-lpython%{python3_version}m" \
+	PYTHON_INSTALL_DIR=%{python3_sitearch} \
+	install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+chmod -x %{buildroot}%{_datadir}/%{name}/lefty/*
+
+# Move docs to the right place
+mkdir -p %{buildroot}%{_docdir}/%{name}
+mv %{buildroot}%{_datadir}/%{name}/doc/* %{buildroot}%{_docdir}/%{name}
 
 # Install README
 install -m0644 README %{buildroot}%{_docdir}/%{name}
@@ -500,8 +390,8 @@ find %{buildroot}%{_docdir}/%{name}/demo -type f -name "*.py" -exec mv {} {}.dem
 rm -f %{buildroot}%{_bindir}/dot_builtins
 
 # Remove metadata from generated PDFs
-pushd %{buildroot}%{_docdir}/%{name}
+pushd %{buildroot}%{_docdir}/%{name}/pdf
-for f in prune gvgen.1 gc.1 dot.1 cluster.1
+for f in prune lneato.1 lefty.1 gvgen.1 gc.1 dotty.1 dot.1 cluster.1
 do
   if [ -f $f.pdf ]
   then
@@ -513,28 +403,26 @@ done
 popd
 
 %if %{with python2}
-install -pD tclpkg/gv/.libs/libgv_python2.so %{buildroot}%{python2_sitearch}/_gv.so
+pushd tclpkg/gv.python2
-install -p tclpkg/gv/gv.py %{buildroot}%{python2_sitearch}/gv.py
+install -pD .libs/libgv_python.so %{buildroot}%{python2_sitearch}/_gv.so
+install -p gv.py %{buildroot}%{python2_sitearch}/gv.py
+popd
 %endif
 
 # python 3
-install -pD tclpkg/gv/.libs/libgv_python3.so %{buildroot}%{python3_sitearch}/_gv.so
+pushd tclpkg/gv
-install -p tclpkg/gv/gv.py %{buildroot}%{python3_sitearch}/gv.py
+install -pD .libs/libgv_python.so %{buildroot}%{python3_sitearch}/_gv.so
+install -p gv.py %{buildroot}%{python3_sitearch}/gv.py
+popd
+
+# remove the python module from the %%_libdir/graphviz/python, it's
+# already installed in the python sitearch
+rm -f %{buildroot}%{_libdir}/graphviz/python/*
+rmdir %{buildroot}%{_libdir}/graphviz/python
 
 # Ghost plugins config
 touch %{buildroot}%{_libdir}/graphviz/config%{pluginsver}
 
-# Fix lua file placement for flatpak
-if [ "%{_prefix}" != "/usr" ]; then
-  cp -ru %{buildroot}/usr/* %{buildroot}%{_prefix}/
-  rm -rf %{buildroot}/usr/*
-fi
-
-# Explicitly create examples directory to always have it.
-# At the moment there are only examples dependant on smyrna. I.e. if smyrna is not
-# built this directory is empty.
-mkdir -p %{buildroot}%{_datadir}/%{name}/examples
-
 %check
 %if %{PHP}
 # Minimal load test of php extension
@@ -551,80 +439,65 @@ php --no-php-ini \
 # make rtest
 
 %post
-%{?ldconfig}
+/sbin/ldconfig
 %{_bindir}/dot -c 2>/dev/null || :
 
-%ldconfig_postun
+%postun
+/sbin/ldconfig
 
 %if %{DEVIL}
 # run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config*
 %post devil
 %{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
+/sbin/ldconfig
 
 %postun devil
 %{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
+/sbin/ldconfig
 %endif
 
 # run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config*
 %post gd
 %{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
+/sbin/ldconfig
 
 %postun gd
 %{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
+/sbin/ldconfig
-
-%if %{with gtk2}
-%post gtk2
-%{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
-
-%postun gtk2
-%{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
-%endif
 
 %if %{MING}
 # run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config*
 %post ming
 %{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
+/sbin/ldconfig
 
 %postun ming
 %{_bindir}/dot -c 2>/dev/null || :
-%{?ldconfig}
+/sbin/ldconfig
 %endif
 
 %files
 %doc %{_docdir}/%{name}
-%if %{GTS}
-%exclude %{_bindir}/smyrna
-%exclude %{_mandir}/man1/smyrna.1*
-%endif
 %{_bindir}/*
 %dir %{_libdir}/graphviz
 %{_libdir}/*.so.*
 %{_libdir}/graphviz/*.so.*
 %{_mandir}/man1/*.1*
 %{_mandir}/man7/*.7*
-%dir %{_datadir}/%{name}
+%dir %{_datadir}/graphviz
-%exclude %{_docdir}/%{name}/*.html
+%exclude %{_docdir}/%{name}/html
-%exclude %{_docdir}/%{name}/*.pdf
+%exclude %{_docdir}/%{name}/pdf
 %exclude %{_docdir}/%{name}/demo
-%{_datadir}/%{name}/gvpr
+%{_datadir}/graphviz/lefty
-%{_datadir}/%{name}/examples
+%{_datadir}/graphviz/gvpr
-%ghost %{_libdir}/%{name}/config%{pluginsver}
+%ghost %{_libdir}/graphviz/config%{pluginsver}
 
 %if %{QTAPPS}
-%{_datadir}/%{name}/gvedit
+%{_datadir}/graphviz/gvedit
 %endif
 
 %exclude %{_libdir}/graphviz/*/*
 %exclude %{_libdir}/graphviz/libgvplugin_gd.*
-%exclude %{_libdir}/graphviz/libgvplugin_gtk.*
-%exclude %{_libdir}/graphviz/libgvplugin_gdk.*
 %if %{DEVIL}
 %exclude %{_libdir}/graphviz/libgvplugin_devil.*
 %endif
@@ -638,7 +511,7 @@ php --no-php-ini \
 %{_libdir}/*.so
 %{_libdir}/graphviz/*.so
 %{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/*.3.*
+%{_mandir}/man3/*.3.gz
 
 %if %{DEVIL}
 %files devil
@@ -646,41 +519,24 @@ php --no-php-ini \
 %endif
 
 %files doc
-%doc %{_docdir}/%{name}/*.html
+%doc %{_docdir}/%{name}/html
-%doc %{_docdir}/%{name}/*.pdf
+%doc %{_docdir}/%{name}/pdf
 %doc %{_docdir}/%{name}/demo
 
-%if %{GTS}
-%files smyrna
-%{_bindir}/smyrna
-%{_datadir}/%{name}/smyrna
-%{_mandir}/man1/smyrna.1*
-%endif
-
 %files gd
 %{_libdir}/graphviz/libgvplugin_gd.so.*
 
-%if %{with gtk2}
-%files gtk2
-%{_libdir}/graphviz/libgvplugin_gtk.so.*
-%{_libdir}/graphviz/libgvplugin_gdk.so.*
-%endif
-
 %files graphs
 %dir %{_datadir}/graphviz
 %{_datadir}/graphviz/graphs
 
-%if %{GUILE}
 %files guile
 %{_libdir}/graphviz/guile/
 %{_mandir}/man3/gv.3guile*
-%endif
 
-%if %{JAVA}
 %files java
 %{_libdir}/graphviz/java/
 %{_mandir}/man3/gv.3java*
-%endif
 
 %files lua
 %{_libdir}/graphviz/lua/
@@ -726,7 +582,7 @@ php --no-php-ini \
 %if %{ARRRR}
 %files R
 %{_libdir}/graphviz/R/
-%{_mandir}/man3/gv.3r.*
+%{_mandir}/man3/gv.3r.gz
 %endif
 
 %files ruby
@@ -747,424 +603,15 @@ php --no-php-ini \
 #  always includes tcldot.3tcl, gdtclft.3tcl
 %{_mandir}/man3/*.3tcl*
 
-%if %{GOLANG}
-%files go
-%{_libdir}/graphviz/go/
-%{_mandir}/man3/gv.3go.*
-%endif
-
 %changelog
-* Tue Jan 24 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 7.1.0-2
+* Wed Apr 24 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-39
-- Release bump to handle gs update
-
-* Tue Jan 24 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 7.1.0-1
-- New version
-  Resolves: rhbz#2162906
-
-* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 7.0.6-4
-- Rebuild OCaml packages for F38
-
-* Mon Jan 23 2023 Zdenek Dohnal <zdohnal@redhat.com> - 7.0.6-3
-- add %%bcond_with bootstrap to break circular dependency with doxygen if needed
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 12 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 7.0.6-1
-- New version
-  Resovles: rhbz#2158703
-
-* Fri Jan 06 2023 Tomas Popela <tpopela@redhat.com> - 7.0.5-3
-- Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be available there
-
-* Wed Jan 04 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 7.0.5-2
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2
-
-* Thu Dec 29 2022 Tom Callaway <spot@fedoraproject.org> - 7.0.5-1
-- update to 7.0.5
-- patch out distutils usage to build with Python 3.12
-
-* Thu Dec 15 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 7.0.4-1
-- New version
-  Resolves: rhbz#2150535
-
-* Thu Dec  1 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 7.0.3-1
-- New version
-  Resolves: rhbz#2148597
-
-* Mon Nov 21 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 7.0.2-1
-- New version
-  Resolves: rhbz#2144128
-
-* Mon Nov 14 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 7.0.1-1
-- New version
-  Resolves: rhbz#2141409
-
-* Tue Nov  1 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 7.0.0-2
-- Temporally drop PHP support due to graphviz issue #2277
-  Resolves: rhbz#2137832
-
-* Mon Oct 24 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 7.0.0-1
-- New version
-  Resolves: rhbz#2137071
-
-* Fri Oct 14 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 6.0.2-3
-- More fixes for conditional build of smyrna
-
-* Fri Oct 14 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 6.0.2-2
-- Made smyrna dependant on GTS
-
-* Thu Oct 13 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 6.0.2-1
-- New version
-  Resolves: rhbz#2133932
-
-* Wed Oct 05 2022 Remi Collet <remi@remirepo.net> - 6.0.1-2
-- rebuild for https://fedoraproject.org/wiki/Changes/php82
-
-* Thu Sep 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 6.0.1-1
-- New version
-  Resolves: rhbz#2125817
-
-* Tue Aug 23 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 5.0.1-1
-- New version
-  Resolves: rhbz#2119990
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 5.0.0-3
-- Only build go subpackage on %%golang_arches (i.e. the architectures where
-  golang is available).
-
-* Fri Jul 15 2022 Jiri Vanek <jvanek@redhat.com> - 5.0.0-2
-- adapted to removal of java on i686
-- finsihing merged https://src.fedoraproject.org/rpms/graphviz/pull-request/9#request_diff
-- ifed out on i686 recomanded rm -v...
-- set --enable-java=no for non java arches
-- added changelog entry, bumped release
-- https://bugzilla.redhat.com/show_bug.cgi?id=2104225
-
-* Tue Jul 12 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 5.0.0-1
-- New version
-  Resolves: rhbz#2105006
-
-* Sun Jul 10 2022 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 4.0.0-9
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
-* Mon Jun 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0-8
-- Rebuilt for ocaml
-  Resolves: rhbz#2098719
-
-* Sun Jun 19 2022 Python Maint <python-maint@redhat.com> - 4.0.0-7
-- Rebuilt for Python 3.11
-
-* Sun Jun 19 2022 Robert-André Mauchin <zebob.m@gmail.com> - 4.0.0-6
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
-* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 4.0.0-5
-- OCaml 4.14.0 rebuild
-
-* Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 4.0.0-4
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 4.0.0-3
-- Rebuilt for Python 3.11
-
-* Thu Jun  9 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0-2
-- Used lm fix patch from upstream
-
-* Mon Jun  6 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0-1
-- New version
-  Resolves: rhbz#2091383
-
-* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.0-2
-- Perl 5.36 rebuild
-
-* Wed Mar  2 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.0-1
-- New version
-  Resolves: rhbz#2058892
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.50.0-6
-- Rebuilt for java-17-openjdk as system jdk
-
-* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 2.50.0-5
-- OCaml 4.13.1 rebuild to remove package notes
-
-* Wed Jan 26 2022 Vít Ondruch <vondruch@redhat.com> - 2.50.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.1
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.50.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Dec 15 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.50.0-2
-- GTK2 stuff Split to the gtk2 subpackage
-  Resolves: rhbz#2032671
-
-* Mon Dec  6 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.50.0-1
-- New version
-  Resolves: rhbz#2029089
-
-* Tue Nov 23 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.49.3-3
-- Fixed gvpack to run
-  Resolves: rhbz#1838679
-
-* Thu Oct 28 2021 Remi Collet <remi@remirepo.net> - 2.49.3-2
-- rebuild for https://fedoraproject.org/wiki/Changes/php81
-
-* Mon Oct 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.49.3-1
-- New version
-  Resolves: rhbz#2016728
-
-* Mon Oct 18 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.49.2-1
-- New version
-  Resolves: rhbz#2014784
-
-* Wed Oct 06 2021 Richard W.M. Jones <rjones@redhat.com> - 2.49.1-2
-- Rebuild for OCaml 4.13.1
-
-* Tue Oct  5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.49.1-1
-- New version
-  Resolves: rhbz#2007059
-
-* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 2.49.0-3
-- OCaml 4.13.1 build
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.49.0-2
-- Rebuilt with OpenSSL 3.0.0
-
-* Mon Sep  6 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.49.0-1
-- New version
-  Resolves: rhbz#1998765
-
-* Fri Jul 23 2021 Aleksei Bavshin <alebastr@fedoraproject.org> - 2.48.0-3
-- Dropped unused runtime dependency from guile 2.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.48.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jul 19 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.48.0-1
-- New version
-  Resolves: rhbz#1983328
-
-* Tue Jun 22 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.3-1
-- New version
-  Resolves: rhbz#1973976
-
-* Tue Jun  8 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.2-3
-- Fixed possible races during docs build which could lead to empty pdf files
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.47.2-2
-- Rebuilt for Python 3.10
-
-* Thu May 27 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.2-1
-- New version
-  Resolves: rhbz#1965146
-
-* Sun May 23 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.47.1-5
-- Perl 5.34 rebuild
-
-* Wed May 12 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.1-4
-- Dropped unneeded tmsize10.clo file
-
-* Fri May  7 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.1-3
-- Added build requirement for gcc-g++
-
-* Fri May  7 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.1-2
-- Conditionalized guile support
-- Updated RHEL macros
-
-* Mon Apr 19 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.1-1
-- New version
-  Resolves: rhbz#1950691
-
-* Tue Mar 23 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.0-2
-- Re-enabled PHP support
-  Resolves: rhbz#1934996
-
-* Tue Mar 16 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.47.0-1
-- New version
-  Resolves: rhbz#1939299
-
-* Mon Mar  8 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.46.1-3
-- Temporary disabled PHP support
-  Resolves: rhbz#1935859
-
-* Thu Mar  4 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.46.1-2
-- Built against guile22
-
-* Wed Mar  3 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.46.1-1
-- New version
-  Related: rhbz#1933722
-
-* Tue Mar  2 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.46.0-1
-- New version
-  Resolves: rhbz#1933722
-
-* Mon Mar  1 13:11:59 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 2.44.0-18
-- OCaml 4.12.0 build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.44.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 07 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.44.0-16
-- F-34: rebuild against ruby 3.0
-
-* Wed Nov 25 2020 Miro Hrončok <mhroncok@redhat.com> - 2.44.0-15
-- Disable Python 2 in ELN
-
-* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 2.44.0-14
-- OCaml 4.11.1 rebuild
-
-* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.44.0-13
-- OCaml 4.11.0 rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.44.0-12
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.44.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.44.0-10
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.44.0-9
-- Perl 5.32 rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.44.0-8
-- Rebuilt for Python 3.9
-
-* Wed May 20 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.44.0-7
-- Also fixed man page typo
-
-* Wed May 20 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.44.0-6
-- Fixed man pages according to man page scan
-
-* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 2.44.0-5
-- OCaml 4.11.0+dev2-2020-04-22 rebuild
-
-* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.44.0-4
-- OCaml 4.11.0 pre-release attempt 2
-
-* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 2.44.0-3
-- OCaml 4.11.0 pre-release
-
-* Wed Apr  8 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.44.0-2
-- Fixed multiple packaging of manual pages
-
-* Wed Apr  8 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.44.0-1
-- New version
-  Resolves: rhbz#1822101
-
-* Mon Apr  6 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.42.4-1
-- New version
-  Resolves: rhbz#1821045
-- Switched to bz2 archives
-- Dropped ocaml-allow-const-cast patch (upstreamed)
-
-* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 2.42.2-10
-- Update all OCaml dependencies for RPM 4.16.
-
-* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 2.42.2-9
-- OCaml 4.10.0 final.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.42.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Jan 19 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.42.2-7
-- F-32: rebuild against ruby27
-
-* Sat Jan 18 2020 Richard W.M. Jones <rjones@redhat.com> - 2.42.2-6
-- Bump release and rebuild.
-
-* Sat Jan 18 2020 Richard W.M. Jones <rjones@redhat.com> - 2.42.2-5
-- OCaml 4.10.0+beta1 rebuild.
-
-* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 2.42.2-4
-- OCaml 4.09.0 (final) rebuild.
-
-* Thu Oct 31 2019 Miro Hrončok <mhroncok@redhat.com> - 2.42.2-3
-- Remove Python 2 package on Fedora 32+
-
-* Fri Oct 04 2019 Remi Collet <remi@remirepo.net> - 2.42.2-2
-- rebuild for https://fedoraproject.org/wiki/Changes/php74
-
-* Wed Oct  2 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.42.2-1
-- New version
-  Resolves: rhbz#1753061
-- Dropped visio, python3, CVE-2018-10196, CVE-2019-11023, and
-  swig4-updated-language-options patches (all upstreamed)
-- Simplified python bindings build process
-
-* Wed Oct 02 2019 Orion Poplawski <orion@nwra.com> - 2.40.1-58
-- Rebuild for lasi 1.1.3 soname bump
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.40.1-57
-- Rebuilt for Python 3.8
-
-* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 2.40.1-56
-- OCaml 4.08.1 (final) rebuild.
-
-* Fri Aug 09 2019 Gwyn Ciesla <gwync@protonmail.com> - 2.40.1-55
-- Glob remaining man pages.
-
-* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 2.40.1-54
-- OCaml 4.08.1 (rc2) rebuild.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.1-53
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 2.40.1-52
-- OCaml 4.08.0 (final) rebuild.
-
-* Tue Jun 04 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.40.1-51
-- Perl 5.30 re-rebuild updated packages
-
-* Mon Jun  3 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-50
-- Fixed FTBFS with python-3.8
-
-* Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.40.1-49
-- Perl 5.30 rebuild
-
-* Tue May  7 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-48
-- Fixed FTBFS caused by swig-4.0.0
-  Resolves: rhbz#1707435
-
-* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 2.40.1-47
-- OCaml 4.08.0 (beta 3) rebuild.
-
-* Wed Apr 24 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-46
 - Updated CVE-2019-11023 patch
   Related: CVE-2019-11023
 
-* Wed Apr 24 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-45
+* Wed Apr 24 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-38
 - Fixed null pointer dereference in function agroot()
   Resolves: CVE-2019-11023
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.40.1-44
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Vít Ondruch <vondruch@redhat.com> - 2.40.1-43
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.6
-
-* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 2.40.1-42
-- Rebuilt for libcrypt.so.2 (#1666033)
-
-* Fri Dec  7 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-41
-- Fixed some issues found by coverity scan
-
-* Thu Oct 18 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-40
-- Clarified license tag
-
-* Mon Oct 15 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-39
-- Dropped rpath
-
-* Thu Oct 11 2018 Remi Collet <remi@remirepo.net> - 2.40.1-38
-- Rebuild for https://fedoraproject.org/wiki/Changes/php73
-
 * Wed Sep 26 2018 Kevin Fenzi <kevin@scrye.com> - 2.40.1-37
 - Don't fail on post scriptlet failures.
 

sources

@@ -1 +1 @@
-SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad
+SHA512 (graphviz-2.40.1.tar.gz) = 65d1ad6aaf0508028eb9061adabf86e35c5bc1ac0e797424d030c8079b596baef498f6e804af06f2baac8d48f1da8f3e00c3bd64deef4bc62b53167b063ef596