Compare commits

..

No commits in common. "rawhide" and "f32" have entirely different histories.
rawhide ... f32

7 changed files with 102 additions and 558 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
/graphviz-*.tar.bz2 graphviz-*.tar.gz
/graphviz-2.42.4.tar.bz2

View File

@ -0,0 +1,26 @@
diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c
index cf738c0..65e17e2 100644
--- a/cmd/lefty/dot2l/dotlex.c
+++ b/cmd/lefty/dot2l/dotlex.c
@@ -252,7 +252,7 @@ static char *scan_token (char *p) {
char *q;
q = lexbuf;
- if (p == '\0')
+ if (!p || *p == '\0')
return NULL;
while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
*q++ = *p++;
diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
index c2b166d..c9a51e9 100644
--- a/cmd/tools/gvgen.c
+++ b/cmd/tools/gvgen.c
@@ -453,6 +453,8 @@ closeOpen (void)
fprintf(opts.outfile, "}\ngraph {\n");
}
+extern void makeTetrix(int depth, edgefn ef);
+
int main(int argc, char *argv[])
{
GraphType graphType;

View File

@ -0,0 +1,22 @@
diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
index 6fdec8f..270c0c8 100644
--- a/cmd/dotty/dotty_ui.lefty
+++ b/cmd/dotty/dotty_ui.lefty
@@ -351,7 +351,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];
@@ -456,7 +456,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;

View File

@ -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

View File

@ -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,,[

View File

@ -1,24 +1,13 @@
%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 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 %else
%bcond_without gtk2 %if 0%{?fedora} > 31
%bcond_with python2
%else
%bcond_without python2
%endif
%bcond_without php
%endif %endif
# Necessary conditionals # Necessary conditionals
@ -43,12 +32,6 @@
# Not in Fedora yet. # Not in Fedora yet.
%global MING 0 %global MING 0
%ifarch %{java_arches}
%global JAVA 1
%else
%global JAVA 0
%endif
%if 0%{?rhel} %if 0%{?rhel}
%global SHARP 0 %global SHARP 0
%global ARRRR 0 %global ARRRR 0
@ -63,18 +46,6 @@
%global PHP 0 %global PHP 0
%endif %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 # Plugins version
%global pluginsver 6 %global pluginsver 6
@ -93,58 +64,23 @@
Name: graphviz Name: graphviz
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
Version: 7.1.0 Version: 2.42.4
Release: 2%{?dist} Release: 1%{?dist}
License: EPL-1.0 License: EPL-1.0
URL: http://www.graphviz.org/ URL: http://www.graphviz.org/
Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
BuildRequires: gcc-g++ # rhbz#1505230
BuildRequires: zlib-devel Patch0: graphviz-2.42.2-dotty-menu-fix.patch
BuildRequires: libpng-devel Patch1: graphviz-2.42.2-coverity-scan-fixes.patch
BuildRequires: libjpeg-devel BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
BuildRequires: expat-devel BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig, sed
BuildRequires: freetype-devel >= 2 BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel
BuildRequires: ksh
BuildRequires: bison
BuildRequires: m4
BuildRequires: flex
BuildRequires: tk-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} %if %{with python2}
BuildRequires: python2-devel BuildRequires: python2-devel
%endif %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 # Temporary workaound for perl(Carp) not pulled
BuildRequires: perl-Carp BuildRequires: perl-Carp
%if %{PHP} %if %{PHP}
@ -171,37 +107,14 @@ BuildRequires: gts-devel
%if %{LASI} %if %{LASI}
BuildRequires: lasi-devel BuildRequires: lasi-devel
%endif %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 # for ps2pdf
BuildRequires: ghostscript BuildRequires: ghostscript
BuildRequires: libgs-devel 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 # 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(post): /sbin/ldconfig
Requires(postun): /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 %description
A collection of tools for the manipulation and layout of graphs (as in nodes A collection of tools for the manipulation and layout of graphs (as in nodes
@ -234,14 +147,6 @@ Summary: PDF and HTML documents for graphviz
%description doc %description doc
Provides some additional PDF and HTML documentation for graphviz. 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 %package gd
Summary: Graphviz plugin for renderers based on gd Summary: Graphviz plugin for renderers based on gd
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -253,40 +158,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 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.) 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 %package graphs
Summary: Demo graphs for graphviz Summary: Demo graphs for graphviz
%description graphs %description graphs
Some demo graphs for graphviz. Some demo graphs for graphviz.
%if %{GUILE}
%package guile %package guile
Summary: Guile extension for graphviz Summary: Guile extension for graphviz
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}, guile
%description guile %description guile
Guile extension for graphviz. Guile extension for graphviz.
%endif
%if %{JAVA}
%package java %package java
Summary: Java extension for graphviz Summary: Java extension for graphviz
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description java %description java
Java extension for graphviz. Java extension for graphviz.
%endif
%package lua %package lua
Summary: Lua extension for graphviz Summary: Lua extension for graphviz
@ -316,6 +206,7 @@ Ocaml extension for graphviz.
%package perl %package perl
Summary: Perl extension for graphviz Summary: Perl extension for graphviz
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description perl %description perl
Perl extension for graphviz. Perl extension for graphviz.
@ -390,28 +281,19 @@ Requires: %{name} = %{version}-%{release}, tcl >= 8.3, tk
%description tcl %description tcl
Various tcl packages (extensions) for the graphviz tools. 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 %prep
%autosetup -p1 %setup -q
%patch0 -p1 -b .dotty-menu-fix
%patch1 -p1 -b .coverity-scan-fixes
# Attempt to fix rpmlint warnings about executable sources # Attempt to fix rpmlint warnings about executable sources
find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';' find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
%build %build
./autogen.sh ./autogen.sh
%if %{JAVA}
# Hack in the java includes we need # Hack in the java includes we need
sed -i '/JavaVM.framework/!s/JAVA_INCLUDES=/JAVA_INCLUDES=\"_MY_JAVA_INCLUDES_\"/g' configure 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 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 # Rewrite config_ruby.rb to work with Ruby 2.2
sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb
sed -i 's|sitearchdir|vendorarchdir|' config/config_ruby.rb sed -i 's|sitearchdir|vendorarchdir|' config/config_ruby.rb
@ -419,11 +301,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 # 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` 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 \ %configure --with-x --disable-static --disable-dependency-tracking \
%if ! %{JAVA}
--enable-java=no \
%endif
--without-mylibgd --with-ipsepcola --with-pangocairo \ --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} %if ! %{LASI}
--without-lasi \ --without-lasi \
%endif %endif
@ -446,34 +325,27 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon
--without-devil \ --without-devil \
%endif %endif
%if ! %{QTAPPS} %if ! %{QTAPPS}
--without-qt \ --without-qt
%endif
%if %{GUILE}
--enable-guile=yes \
%else
--enable-guile=no \
%endif
%if %{GOLANG}
--enable-go=yes
%else
--enable-go=no
%endif %endif
# drop rpath # drop rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}"
%if %{without bootstrap}
make doxygen
%endif
%install %install
%make_install docdir=%{_docdir}/%{name} \ make DESTDIR=%{buildroot} \
pkgconfigdir=%{_libdir}/pkgconfig docdir=%{buildroot}%{_docdir}/%{name} \
pkgconfigdir=%{_libdir}/pkgconfig \
install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' 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 README
install -m0644 README %{buildroot}%{_docdir}/%{name} install -m0644 README %{buildroot}%{_docdir}/%{name}
@ -500,8 +372,8 @@ find %{buildroot}%{_docdir}/%{name}/demo -type f -name "*.py" -exec mv {} {}.dem
rm -f %{buildroot}%{_bindir}/dot_builtins rm -f %{buildroot}%{_bindir}/dot_builtins
# Remove metadata from generated PDFs # 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 do
if [ -f $f.pdf ] if [ -f $f.pdf ]
then then
@ -530,11 +402,6 @@ if [ "%{_prefix}" != "/usr" ]; then
rm -rf %{buildroot}/usr/* rm -rf %{buildroot}/usr/*
fi 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 %check
%if %{PHP} %if %{PHP}
# Minimal load test of php extension # Minimal load test of php extension
@ -576,16 +443,6 @@ php --no-php-ini \
%{_bindir}/dot -c 2>/dev/null || : %{_bindir}/dot -c 2>/dev/null || :
%{?ldconfig} %{?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} %if %{MING}
# run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config* # run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config*
%post ming %post ming
@ -599,32 +456,26 @@ php --no-php-ini \
%files %files
%doc %{_docdir}/%{name} %doc %{_docdir}/%{name}
%if %{GTS}
%exclude %{_bindir}/smyrna
%exclude %{_mandir}/man1/smyrna.1*
%endif
%{_bindir}/* %{_bindir}/*
%dir %{_libdir}/graphviz %dir %{_libdir}/graphviz
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libdir}/graphviz/*.so.* %{_libdir}/graphviz/*.so.*
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%{_mandir}/man7/*.7* %{_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 %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} %if %{QTAPPS}
%{_datadir}/%{name}/gvedit %{_datadir}/graphviz/gvedit
%endif %endif
%exclude %{_libdir}/graphviz/*/* %exclude %{_libdir}/graphviz/*/*
%exclude %{_libdir}/graphviz/libgvplugin_gd.* %exclude %{_libdir}/graphviz/libgvplugin_gd.*
%exclude %{_libdir}/graphviz/libgvplugin_gtk.*
%exclude %{_libdir}/graphviz/libgvplugin_gdk.*
%if %{DEVIL} %if %{DEVIL}
%exclude %{_libdir}/graphviz/libgvplugin_devil.* %exclude %{_libdir}/graphviz/libgvplugin_devil.*
%endif %endif
@ -638,7 +489,7 @@ php --no-php-ini \
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/graphviz/*.so %{_libdir}/graphviz/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/*.3.* %{_mandir}/man3/*.3*
%if %{DEVIL} %if %{DEVIL}
%files devil %files devil
@ -646,41 +497,24 @@ php --no-php-ini \
%endif %endif
%files doc %files doc
%doc %{_docdir}/%{name}/*.html %doc %{_docdir}/%{name}/html
%doc %{_docdir}/%{name}/*.pdf %doc %{_docdir}/%{name}/pdf
%doc %{_docdir}/%{name}/demo %doc %{_docdir}/%{name}/demo
%if %{GTS}
%files smyrna
%{_bindir}/smyrna
%{_datadir}/%{name}/smyrna
%{_mandir}/man1/smyrna.1*
%endif
%files gd %files gd
%{_libdir}/graphviz/libgvplugin_gd.so.* %{_libdir}/graphviz/libgvplugin_gd.so.*
%if %{with gtk2}
%files gtk2
%{_libdir}/graphviz/libgvplugin_gtk.so.*
%{_libdir}/graphviz/libgvplugin_gdk.so.*
%endif
%files graphs %files graphs
%dir %{_datadir}/graphviz %dir %{_datadir}/graphviz
%{_datadir}/graphviz/graphs %{_datadir}/graphviz/graphs
%if %{GUILE}
%files guile %files guile
%{_libdir}/graphviz/guile/ %{_libdir}/graphviz/guile/
%{_mandir}/man3/gv.3guile* %{_mandir}/man3/gv.3guile*
%endif
%if %{JAVA}
%files java %files java
%{_libdir}/graphviz/java/ %{_libdir}/graphviz/java/
%{_mandir}/man3/gv.3java* %{_mandir}/man3/gv.3java*
%endif
%files lua %files lua
%{_libdir}/graphviz/lua/ %{_libdir}/graphviz/lua/
@ -726,7 +560,7 @@ php --no-php-ini \
%if %{ARRRR} %if %{ARRRR}
%files R %files R
%{_libdir}/graphviz/R/ %{_libdir}/graphviz/R/
%{_mandir}/man3/gv.3r.* %{_mandir}/man3/gv.3r*
%endif %endif
%files ruby %files ruby
@ -747,318 +581,7 @@ php --no-php-ini \
# always includes tcldot.3tcl, gdtclft.3tcl # always includes tcldot.3tcl, gdtclft.3tcl
%{_mandir}/man3/*.3tcl* %{_mandir}/man3/*.3tcl*
%if %{GOLANG}
%files go
%{_libdir}/graphviz/go/
%{_mandir}/man3/gv.3go.*
%endif
%changelog %changelog
* Tue Jan 24 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 7.1.0-2
- 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 * Mon Apr 6 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.42.4-1
- New version - New version
Resolves: rhbz#1821045 Resolves: rhbz#1821045

View File

@ -1 +1 @@
SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad SHA512 (graphviz-2.42.4.tar.bz2) = aa831069a45bfbfa2f570d60323e986f42685ea52e5217905b0f31d96d69b5776c6a1c2ce3fe48f5bbe6383146b0cfa867043d496acb281b1d50a46aa7e8856f