Fixed gvpack to run

Resolves: rhbz#2029565
This commit is contained in:
Jaroslav Škarvada 2022-01-20 11:20:08 +01:00
parent fa974b6d4d
commit 6556d2b1ac
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 9c0e9ff..29687d2 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -162,7 +162,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.c

View File

@ -68,7 +68,7 @@
Name: graphviz
Summary: Graph Visualization Tools
Version: 2.44.0
Release: 24%{?dist}
Release: 25%{?dist}
License: EPL-1.0
URL: http://www.graphviz.org/
Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
@ -78,6 +78,7 @@ Patch1: graphviz-2.42.2-coverity-scan-fixes.patch
# rhbz#1612692, https://gitlab.com/graphviz/graphviz/-/merge_requests/1367
Patch2: graphviz-2.44.0-man-fix.patch
Patch3: graphviz-2.44.0-CVE-2020-18032.patch
Patch4: graphviz-2.44.0-gvpack-neato-static.patch
BuildRequires: gcc-g++
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
@ -300,6 +301,7 @@ Various tcl packages (extensions) for the graphviz tools.
%patch1 -p1 -b .coverity-scan-fixes
%patch2 -p1 -b .man-fix
%patch3 -p1 -b .CVE-2020-18032
%patch4 -p1 -b .gvpack-neato-static
# Attempt to fix rpmlint warnings about executable sources
find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
@ -604,6 +606,10 @@ php --no-php-ini \
%{_mandir}/man3/*.3tcl*
%changelog
* Thu Jan 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2.44.0-25
- Fixed gvpack to run
Resolves: rhbz#2029565
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.44.0-24
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688