The package rpms/graphviz.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/graphviz.git/commit/?id=bd4547732....
Change:
+%ifnarch %{ix86}
Thanks.
Full change:
============
commit bd454773212204e6f3e421fa2ce0354e8730f630
Author: Iñaki Úcar <iucar(a)fedoraproject.org>
Date: Sun Apr 28 00:44:37 2024 +0200
Revert wrong push (apologies)
diff --git a/graphviz-10.0.1-gvpack-neato-static.patch
b/graphviz-4.0.0-gvpack-neato-static.patch
similarity index 68%
rename from graphviz-10.0.1-gvpack-neato-static.patch
rename to graphviz-4.0.0-gvpack-neato-static.patch
index 9ac0bd6..dcb6863 100644
--- a/graphviz-10.0.1-gvpack-neato-static.patch
+++ b/graphviz-4.0.0-gvpack-neato-static.patch
@@ -1,15 +1,15 @@
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
-index 8bab1cf..d05cda9 100644
+index 4978fea..9fbe2e2 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
-@@ -136,7 +136,9 @@ gvpack_LDADD = \
- $(top_builddir)/lib/gvc/libgvc.la \
+@@ -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) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
++ $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
if ENABLE_STATIC
gvpack_static_SOURCES = gvpack.cpp
diff --git a/graphviz-9.0.0-doxygen-fix.patch b/graphviz-9.0.0-doxygen-fix.patch
new file mode 100644
index 0000000..03bffb4
--- /dev/null
+++ b/graphviz-9.0.0-doxygen-fix.patch
@@ -0,0 +1,60 @@
+diff --git a/Doxyfile b/Doxyfile
+index d9442cf..14c1015 100644
+--- a/Doxyfile
++++ b/Doxyfile
+@@ -68,7 +68,7 @@ PROJECT_LOGO =
+ # entered, it will be relative to the location where doxygen was started. If
+ # left blank the current directory will be used.
+
+-OUTPUT_DIRECTORY = graphviz/public
++OUTPUT_DIRECTORY = ./public
+
+ # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+ # sub-directories (in 2 levels) under the output directory of each output format
+@@ -911,11 +911,11 @@ WARN_LOGFILE =
+ # because doxygen builds directory dependency graphs only for root children,
+ # but not for root directory itself.
+
+-INPUT = graphviz/cmd \
+- graphviz/lib \
+- graphviz/dot.demo \
+- graphviz/plugin \
+- graphviz/tclpkg
++INPUT = ./cmd \
++ ./lib \
++ ./dot.demo \
++ ./plugin \
++ ./tclpkg
+
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+diff --git a/Doxyfile.in b/Doxyfile.in
+index 050f623..a86c859 100644
+--- a/Doxyfile.in
++++ b/Doxyfile.in
+@@ -68,7 +68,7 @@ PROJECT_LOGO =
+ # entered, it will be relative to the location where doxygen was started. If
+ # left blank the current directory will be used.
+
+-OUTPUT_DIRECTORY = graphviz/public
++OUTPUT_DIRECTORY = ./public
+
+ # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+ # sub-directories (in 2 levels) under the output directory of each output format
+@@ -911,11 +911,11 @@ WARN_LOGFILE =
+ # because doxygen builds directory dependency graphs only for root children,
+ # but not for root directory itself.
+
+-INPUT = graphviz/cmd \
+- graphviz/lib \
+- graphviz/dot.demo \
+- graphviz/plugin \
+- graphviz/tclpkg
++INPUT = ./cmd \
++ ./lib \
++ ./dot.demo \
++ ./plugin \
++ ./tclpkg
+
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/graphviz.spec b/graphviz.spec
index e7cc205..cfa0d2b 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -27,6 +27,13 @@
%global SHARP 0
%endif
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+%ifnarch %{ix86}
+%global OCAML 1
+%else
+%global OCAML 0
+%endif
+
%global DEVIL 1
%global ARRRR 1
@@ -96,8 +103,8 @@
Name: graphviz
Summary: Graph Visualization Tools
-Version: 10.0.1
-Release: 2%{?dist}
+Version: 9.0.0
+Release: 11%{?dist}
License: epl-1.0 AND cpl-1.0 AND bsd-3-clause AND mit AND gpl-3.0-or-later WITH
bison-exception-2.2 AND apache-1.1 AND lgpl-2.0-or-later WITH libtool-exception AND smlnj
AND hpnd-uc
URL:
http://www.graphviz.org/
#Source0:
https://gitlab.com/%%{name}/%%{name}/-/archive/%%{version}/%%{name}-%%{ve...
@@ -164,6 +171,9 @@ BuildRequires: DevIL-devel
%if %{ARRRR}
BuildRequires: R-devel
%endif
+%if %{OCAML}
+BuildRequires: ocaml
+%endif
%if %{QTAPPS}
BuildRequires: qt-devel
%endif
@@ -195,7 +205,9 @@ BuildRequires: golang
%endif
Requires: urw-base35-fonts
# rhbz#1838679
-Patch0: graphviz-10.0.1-gvpack-neato-static.patch
+Patch0: graphviz-4.0.0-gvpack-neato-static.patch
+#
https://gitlab.com/graphviz/graphviz/-/issues/2448
+Patch1: graphviz-9.0.0-doxygen-fix.patch
%if ! %{JAVA}
Obsoletes: graphviz-java < %{version}-%{release}
@@ -298,6 +310,15 @@ Requires: %{name} = %{version}-%{release}
Graphviz plugin for -Tswf (flash) renderer based on ming.
%endif
+%if %{OCAML}
+%package ocaml
+Summary: Ocaml extension for graphviz
+Requires: %{name} = %{version}-%{release}
+
+%description ocaml
+Ocaml extension for graphviz.
+%endif
+
%package perl
Summary: Perl extension for graphviz
Requires: %{name} = %{version}-%{release}
@@ -427,6 +448,9 @@ export CPPFLAGS=-I`ruby -e "puts
File.join(RbConfig::CONFIG['includedir'], RbCon
%if ! %{SHARP}
--disable-sharp \
%endif
+%if ! %{OCAML}
+ --disable-ocaml \
+%endif
%if ! %{MING}
--without-ming \
%endif
@@ -574,6 +598,7 @@ php --no-php-ini \
%exclude %{_libdir}/graphviz/*/*
%exclude %{_libdir}/graphviz/libgvplugin_gd.*
%if %{with gtk2}
+%exclude %{_libdir}/graphviz/libgvplugin_gtk.*
%exclude %{_libdir}/graphviz/libgvplugin_gdk.*
%endif
%if %{DEVIL}
@@ -613,6 +638,7 @@ php --no-php-ini \
%if %{with gtk2}
%files gtk2
+%{_libdir}/graphviz/libgvplugin_gtk.so.*
%{_libdir}/graphviz/libgvplugin_gdk.so.*
%endif
@@ -643,6 +669,12 @@ php --no-php-ini \
%{_libdir}/graphviz/*fdb
%endif
+%if %{OCAML}
+%files ocaml
+%{_libdir}/graphviz/ocaml/
+%{_mandir}/man3/gv.3ocaml*
+%endif
+
%files perl
%{_libdir}/graphviz/perl/
%{_libdir}/perl*/*
@@ -698,14 +730,6 @@ php --no-php-ini \
%endif
%changelog
-* Thu Apr 25 2024 Iñaki Úcar <iucar(a)fedoraproject.org> - 10.0.1-2
-- R-maint-sig mass rebuild
-
-* Wed Feb 14 2024 Jaroslav Škarvada <jskarvad(a)redhat.com> - 10.0.1-1
-- New version
- Resolves: rhbz#2263690
-- Dropped gtk and ocaml plugins (dropped upstream)
-
* Sun Feb 11 2024 Maxwell G <maxwell(a)gtmx.me> - 9.0.0-11
- Rebuild for golang 1.22.0
diff --git a/sources b/sources
index 22b248b..b52bb68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (graphviz-10.0.1.tar.xz) =
5e6a195357d38aa93fbd231c854b25e4ae4b0efd011de1e37550bc77b2137c98d72fdf7b0df0e8f3e9ba70849461e85cbd591b0064eccfc8788fcf532b7ae2c1
+SHA512 (graphviz-9.0.0.tar.xz) =
912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c