From 0500a7ef92d0c6f0f0dd6bd56f3ca6d4fef7e410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 6 Apr 2020 17:27:43 +0200 Subject: [PATCH] New version Resolves: rhbz#1821045 Switched to bz2 archives Dropped ocaml-allow-const-cast patch (upstreamed) --- .gitignore | 1 + graphviz-2.42.2-ocaml-allow-const-cast.patch | 15 --------------- graphviz.spec | 19 ++++++++++--------- sources | 2 +- 4 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 graphviz-2.42.2-ocaml-allow-const-cast.patch diff --git a/.gitignore b/.gitignore index cf3cadc..7e6f654 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ graphviz-*.tar.gz +/graphviz-2.42.4.tar.bz2 diff --git a/graphviz-2.42.2-ocaml-allow-const-cast.patch b/graphviz-2.42.2-ocaml-allow-const-cast.patch deleted file mode 100644 index 31af6da..0000000 --- a/graphviz-2.42.2-ocaml-allow-const-cast.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- graphviz-stable_release_2.42.2/tclpkg/gv/Makefile.am 2019-09-12 03:11:30.000000000 +0100 -+++ graphviz-stable_release_2.42.2.new/tclpkg/gv/Makefile.am 2019-12-06 13:05:44.064150008 +0000 -@@ -130,7 +130,11 @@ - libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c - libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS) - libgv_ocaml_la_LDFLAGS = -module -avoid-version --libgv_ocaml_la_CPPFLAGS = $(BASECPPFLAGS) $(OCAML_INCLUDES) -Dint64=int64_t -+libgv_ocaml_la_CPPFLAGS = \ -+ $(BASECPPFLAGS) \ -+ $(OCAML_INCLUDES) \ -+ -Dint64=int64_t \ -+ -fpermissive - gv.ml gv.mli: gv_ocaml.cpp - gv_ocaml.cpp: gv.i - $(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i diff --git a/graphviz.spec b/graphviz.spec index 6936c9d..5ab1f97 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -64,18 +64,14 @@ Name: graphviz Summary: Graph Visualization Tools -Version: 2.42.2 -Release: 10%{?dist} +Version: 2.42.4 +Release: 1%{?dist} License: EPL-1.0 URL: http://www.graphviz.org/ -# A bit hacking needed due to: https://gitlab.com/graphviz/graphviz/issues/1371 -Source0: https://gitlab.com/%{name}/%{name}/-/archive/stable_release_%{version}/%{name}-stable_release_%{version}.tar.gz #/%{name}-%{version}.tar.gz +Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 # rhbz#1505230 Patch0: graphviz-2.42.2-dotty-menu-fix.patch Patch1: graphviz-2.42.2-coverity-scan-fixes.patch -# Workaround for some const casting badness in the OCaml bindings. -# Real fix will need a fix to SWIG. -Patch2: graphviz-2.42.2-ocaml-allow-const-cast.patch BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig, sed BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel @@ -286,10 +282,9 @@ Requires: %{name} = %{version}-%{release}, tcl >= 8.3, tk Various tcl packages (extensions) for the graphviz tools. %prep -%setup -q -n graphviz-stable_release_%{version} +%setup -q %patch0 -p1 -b .dotty-menu-fix %patch1 -p1 -b .coverity-scan-fixes -%patch2 -p1 # Attempt to fix rpmlint warnings about executable sources find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';' @@ -587,6 +582,12 @@ php --no-php-ini \ %{_mandir}/man3/*.3tcl* %changelog +* Mon Apr 6 2020 Jaroslav Škarvada - 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 - 2.42.2-10 - Update all OCaml dependencies for RPM 4.16. diff --git a/sources b/sources index 743bf3a..96b6afe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (graphviz-2.42.2.tar.gz) = 52c7e94290b16b5dbe6f7e9bde34d31b1c0e748df207a4ae46c8d862de7bed21a19d638aaf98cac8204a506b4dfaaa04e88b586fcd37e67f07a291bd498c2b36 +SHA512 (graphviz-2.42.4.tar.bz2) = aa831069a45bfbfa2f570d60323e986f42685ea52e5217905b0f31d96d69b5776c6a1c2ce3fe48f5bbe6383146b0cfa867043d496acb281b1d50a46aa7e8856f