pool/graphviz
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 734086 from graphics

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/734086
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2019-10-07 11:40:14 +00:00 committed by Git OBS Bridge
commit 7fe9d29146
8 changed files with 128 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -1,5 +1,5 @@
<services> <services>
<service mode="disabled" name="tar_scm"> <service mode="disabled" name="tar_scm">
<param name="url">https://gitlab.com/graphviz/graphviz</param> <param name="url">https://gitlab.com/graphviz/graphviz</param>
<param name="scm">git</param> <param name="scm">git</param>
@ -13,4 +13,4 @@
<param name="compression">gz</param> <param name="compression">gz</param>
</service> </service>
<service mode="disabled" name="set_version"/> <service mode="disabled" name="set_version"/>
</services> </services>

3
graphviz-2.40.1+git20190410.b0871968d.tar.gz
View File

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

3
graphviz-2.42.1.tar.gz Normal file
View File

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

9
graphviz-addons.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 4 11:56:02 UTC 2019 - Christian Vögl <christian.voegl@suse.com>
- Switch from github master to new release 2.42.1
- Fixes CVE-2018-10196 (bsc#1132091)
- Fixes quite a few bugs
- Removed graphviz-fix-ruby-version.patch (fixed in upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 9 19:45:23 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> Thu May 9 19:45:23 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

7
graphviz-addons.spec
View File

@ -48,13 +48,13 @@
%define sle12 0 %define sle12 0
%endif %endif
Name: graphviz-addons Name: graphviz-addons
Version: 2.40.1+git20190410.b0871968d Version: 2.42.1
Release: 0 Release: 0
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
License: EPL-1.0 License: EPL-1.0
Group: Productivity/Graphics/Visualization/Graph Group: Productivity/Graphics/Visualization/Graph
Url: http://www.graphviz.org/ Url: http://www.graphviz.org/
Source: %{mname}-%{version}.tar.gz Source: https://www2.graphviz.org/Packages/stable/portable_source/graphviz-%{version}.tar.gz
Source2: graphviz-rpmlintrc Source2: graphviz-rpmlintrc
#PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL
Patch1: graphviz-smyrna-link_against_glu.patch Patch1: graphviz-smyrna-link_against_glu.patch
@ -66,7 +66,7 @@ Patch6: graphviz-2.20.2-interpreter_names.patch
#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
Patch7: graphviz-useless_warnings.patch Patch7: graphviz-useless_warnings.patch
Patch8: graphviz-no_strict_aliasing.patch Patch8: graphviz-no_strict_aliasing.patch
Patch9: graphviz-fix-ruby-version.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
@ -321,7 +321,6 @@ programs that use the graphviz libraries including man3 pages.
%patch6 %patch6
%patch7 %patch7
%patch8 %patch8
%patch9
# pkg-config returns 0 (TRUE) when guile-2.2 is present # pkg-config returns 0 (TRUE) when guile-2.2 is present
if pkg-config --atleast-version=2.2 guile-2.2; then if pkg-config --atleast-version=2.2 guile-2.2; then

19
graphviz-fix-ruby-version.patch
View File

@ -1,19 +0,0 @@
--- configure.ac.orig 2019-04-11 15:12:07.607681824 +0200
+++ configure.ac 2019-04-11 14:43:28.508860376 +0200
@@ -116,6 +116,7 @@
AC_ARG_VAR(LIBPOSTFIX, [subscript to lib, e.g. "/64" for "/usr/lib/64" on Solaris])
AC_ARG_VAR(INTGOSIZE, [integer size for go, 32 or 64])
+AC_ARG_VAR(RUBY_VER, [version number of ruby package])
INTGOSIZE=32
if test -z "$LIBPOSTFIX"; then
@@ -1397,7 +1398,7 @@
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
fi
],[
- PKG_CHECK_MODULES([RUBY], [ruby-1.9],[
+ PKG_CHECK_MODULES([RUBY], [ruby-${RUBY_VER}],[
AC_CHECK_PROG(RUBY,ruby,ruby)
if test "x$RUBY" = "x"; then
use_ruby="No (ruby not available)"

9
graphviz.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 4 11:56:02 UTC 2019 - Christian Vögl <christian.voegl@suse.com>
- Switch from github master to new release 2.42.1
- Fixes CVE-2018-10196 (bsc#1132091)
- Fixes quite a few bugs
- Removed graphviz-fix-ruby-version.patch (fixed in upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 9 19:45:23 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> Thu May 9 19:45:23 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

7
graphviz.spec
View File

@ -48,13 +48,13 @@
%define sle12 0 %define sle12 0
%endif %endif
Name: graphviz Name: graphviz
Version: 2.40.1+git20190410.b0871968d Version: 2.42.1
Release: 0 Release: 0
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
License: EPL-1.0 License: EPL-1.0
Group: Productivity/Graphics/Visualization/Graph Group: Productivity/Graphics/Visualization/Graph
Url: http://www.graphviz.org/ Url: http://www.graphviz.org/
Source: %{mname}-%{version}.tar.gz Source: https://www2.graphviz.org/Packages/stable/portable_source/graphviz-%{version}.tar.gz
Source2: graphviz-rpmlintrc Source2: graphviz-rpmlintrc
#PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL
Patch1: graphviz-smyrna-link_against_glu.patch Patch1: graphviz-smyrna-link_against_glu.patch
@ -66,7 +66,7 @@ Patch6: graphviz-2.20.2-interpreter_names.patch
#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
Patch7: graphviz-useless_warnings.patch Patch7: graphviz-useless_warnings.patch
Patch8: graphviz-no_strict_aliasing.patch Patch8: graphviz-no_strict_aliasing.patch
Patch9: graphviz-fix-ruby-version.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
@ -321,7 +321,6 @@ programs that use the graphviz libraries including man3 pages.
%patch6 %patch6
%patch7 %patch7
%patch8 %patch8
%patch9
# pkg-config returns 0 (TRUE) when guile-2.2 is present # pkg-config returns 0 (TRUE) when guile-2.2 is present
if pkg-config --atleast-version=2.2 guile-2.2; then if pkg-config --atleast-version=2.2 guile-2.2; then