Accepting request 893124 from home:susnux:branches:graphics

- Update to version 2.47.1

OBS-URL: https://build.opensuse.org/request/show/893124
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=161

_service

@@ -1,16 +0,0 @@
-
-<services>
-  <service mode="disabled" name="tar_scm">
-    <param name="url">https://gitlab.com/graphviz/graphviz</param>
-    <param name="scm">git</param>
-    <param name="revision">master</param>
-    <param name="changesgenerate">disable</param>
-    <param name="filename">graphviz</param>
-    <param name="versionformat">2.42.3</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
-</services>

graphviz-2.46-fix-shebang.patch

@@ -1,8 +0,0 @@
---- graphviz-2.46.1/cmd/gvmap/gvmap.sh.orig	2021-02-18 18:41:12.414357238 +0100
-+++ graphviz-2.46.1/cmd/gvmap/gvmap.sh	2021-02-18 18:41:23.626463135 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ksh
-+#!/usr/bin/ksh
- 
- # Script for gvmap pipeline
- # Use -A to add flags for gvmap; e.g., -Ae results in gvmap -e

graphviz-2.46.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:931ed197bc833aec8501d66194b01620dd395130c380e350a6ec1b31e4866eac
-size 34065777

graphviz-2.47.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e151a039113a0f1ff871185ef760ec67fbc30144ea25a5024c3ee42d0aa9b01e
+size 27711428

graphviz.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri May 14 13:05:09 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 2.47.1
+  * More detailed error messages when opening input file fails
+  * The edges in JSON output are ordered now
+  * Fixed xdot man page does not document some functions
+  * Fixed PIC renderer
+  * Fixed dot conversion to dia format
+  * Fixed memory leak of reference-counted HTML strings
+  * Fix for TBbalance attribute code
+  * Fixed HTML parser error with single closing square bracket in
+    table row
+  * Fixed reference counted strings put the HTML bit in the middle
+    of the reference count
+  * Fixed &amp; escape disappearing
+  * Fixed gvpr -? to actually print usage and exit non-zero
+  * Fixed memory leak in libmingle
+  * Fixed memory leak in ANN bridge
+  * Fixed buffer overflow in unflatten
+  * Fixed agxbputc macro does not bracket its arguments
+- Drop upstream fixed graphviz-2.46-fix-shebang.patch
+  * Using POSIX shell, no need for ksh
+
 -------------------------------------------------------------------
 Wed Apr 14 08:19:54 UTC 2021 - Andreas Schwab <schwab@suse.de>
 

graphviz.spec

@@ -54,26 +54,24 @@
 %endif
 %bcond_without python2
 Name:           graphviz%{psuffix}
-Version:        2.46.1
+Version:        2.47.1
 Release:        0
 Summary:        Graph Visualization Tools
 License:        EPL-1.0
 Group:          Productivity/Graphics/Visualization/Graph
 URL:            https://www.graphviz.org/
-Source0:        https://gitlab.com/graphviz/graphviz/-/archive/2.46.1/graphviz-%{version}.tar.gz
+Source0:        https://gitlab.com/graphviz/graphviz/-/archive/2.46.1/graphviz-%{version}.tar.bz2
 Source1:        graphviz-rpmlintrc
 #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL
-Patch1:         graphviz-smyrna-link_against_glu.patch
-Patch2:         graphviz-fix-pkgIndex.patch
+Patch0:         graphviz-smyrna-link_against_glu.patch
+Patch1:         graphviz-fix-pkgIndex.patch
 #PATCH-FIX-UPSTREAM Off-by-one bug
-Patch3:         graphviz-array_overflow.patch
-
-Patch6:         graphviz-2.20.2-interpreter_names.patch
+Patch2:         graphviz-array_overflow.patch
+Patch3:         graphviz-2.20.2-interpreter_names.patch
 #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
-Patch7:         graphviz-useless_warnings.patch
-Patch8:         graphviz-no_strict_aliasing.patch
-Patch9:         graphviz-no_php_extra_libs.patch
-Patch10:        graphviz-2.46-fix-shebang.patch
+Patch4:         graphviz-useless_warnings.patch
+Patch5:         graphviz-no_strict_aliasing.patch
+Patch6:         graphviz-no_php_extra_libs.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -350,16 +348,13 @@ programs that use the graphviz libraries including man3 pages.
 
 %prep
 %setup -q -n %{mname}-%{version}
-
+%patch0
 %patch1
 %patch2
 %patch3
-
+%patch4
+%patch5 -p1
 %patch6
-%patch7
-%patch8 -p1
-%patch9
-%patch10 -p1
 
 # pkg-config returns 0 (TRUE) when guile-2.2 is present
 if pkg-config --atleast-version=2.2 guile-2.2; then