Compare commits
27 Commits
f37-riscv6
...
rawhide
Author | SHA1 | Date | |
---|---|---|---|
|
7513cdf248 | ||
|
05e4b1d074 | ||
|
c2276e33ca | ||
|
30971d5a25 | ||
|
ff79a90e46 | ||
|
0ec15827c5 | ||
|
71a7ec6ed1 | ||
|
595919defd | ||
|
9a8b223d88 | ||
|
519230f9de | ||
|
8d8d1dd380 | ||
|
ca5090298b | ||
|
b93a6781b5 | ||
|
5b8ce2dae9 | ||
|
44cc3b4ef2 | ||
|
2e3acff6b5 | ||
|
7180966e60 | ||
|
e9d5ffdbef | ||
|
c68359c5ff | ||
|
f139298a72 | ||
|
73ae39950d | ||
|
f00bcecf72 | ||
|
b0b4b82fa4 | ||
|
e08648fc87 | ||
|
2cbf116dab | ||
|
0661f83df8 | ||
|
fb3b36fdd4 |
13
graphviz-7.0.6-fix-python-3.12.patch
Normal file
13
graphviz-7.0.6-fix-python-3.12.patch
Normal file
@ -0,0 +1,13 @@
|
||||
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,,[
|
124
graphviz.spec
124
graphviz.spec
@ -3,11 +3,24 @@
|
||||
%bcond_with php
|
||||
%bcond_with guile
|
||||
%else
|
||||
%bcond_without php
|
||||
# temporal drop of PHP support due to https://gitlab.com/graphviz/graphviz/-/issues/2277
|
||||
%bcond_with php
|
||||
%bcond_without guile
|
||||
%endif
|
||||
%bcond_with python2
|
||||
|
||||
# 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
|
||||
%bcond_without gtk2
|
||||
%endif
|
||||
|
||||
# Necessary conditionals
|
||||
%ifarch %{mono_arches}
|
||||
%global SHARP 1
|
||||
@ -80,8 +93,8 @@
|
||||
|
||||
Name: graphviz
|
||||
Summary: Graph Visualization Tools
|
||||
Version: 5.0.0
|
||||
Release: 4%{?dist}.rvre0
|
||||
Version: 7.1.0
|
||||
Release: 2%{?dist}
|
||||
License: EPL-1.0
|
||||
URL: http://www.graphviz.org/
|
||||
Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
|
||||
@ -122,7 +135,9 @@ 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
|
||||
@ -168,7 +183,9 @@ BuildRequires: poppler-glib-devel
|
||||
BuildRequires: freeglut-devel
|
||||
BuildRequires: libglade2-devel
|
||||
BuildRequires: gtkglext-devel
|
||||
%if %{without bootstrap}
|
||||
BuildRequires: doxygen
|
||||
%endif
|
||||
%if %{GOLANG}
|
||||
BuildRequires: golang
|
||||
%endif
|
||||
@ -179,6 +196,8 @@ Requires(post): /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}
|
||||
@ -215,11 +234,13 @@ Summary: PDF and HTML documents for graphviz
|
||||
%description doc
|
||||
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
|
||||
Summary: Graphviz plugin for renderers based on gd
|
||||
@ -232,6 +253,7 @@ 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
|
||||
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}
|
||||
@ -240,6 +262,7 @@ Requires(postun): %{_bindir}/dot /sbin/ldconfig
|
||||
|
||||
%description gtk2
|
||||
Graphviz plugin for renderers based on gtk2.
|
||||
%endif
|
||||
|
||||
%package graphs
|
||||
Summary: Demo graphs for graphviz
|
||||
@ -293,7 +316,6 @@ Ocaml extension for graphviz.
|
||||
%package perl
|
||||
Summary: Perl extension for graphviz
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||
|
||||
%description perl
|
||||
Perl extension for graphviz.
|
||||
@ -443,7 +465,10 @@ 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}" \
|
||||
CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}"
|
||||
|
||||
%if %{without bootstrap}
|
||||
make doxygen
|
||||
%endif
|
||||
|
||||
%install
|
||||
%make_install docdir=%{_docdir}/%{name} \
|
||||
@ -505,6 +530,11 @@ if [ "%{_prefix}" != "/usr" ]; then
|
||||
rm -rf %{buildroot}/usr/*
|
||||
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
|
||||
%if %{PHP}
|
||||
# Minimal load test of php extension
|
||||
@ -546,6 +576,7 @@ php --no-php-ini \
|
||||
%{_bindir}/dot -c 2>/dev/null || :
|
||||
%{?ldconfig}
|
||||
|
||||
%if %{with gtk2}
|
||||
%post gtk2
|
||||
%{_bindir}/dot -c 2>/dev/null || :
|
||||
%{?ldconfig}
|
||||
@ -553,6 +584,7 @@ php --no-php-ini \
|
||||
%postun gtk2
|
||||
%{_bindir}/dot -c 2>/dev/null || :
|
||||
%{?ldconfig}
|
||||
%endif
|
||||
|
||||
%if %{MING}
|
||||
# run "dot -c" to generate plugin config in %%{_libdir}/graphviz/config*
|
||||
@ -567,12 +599,14 @@ php --no-php-ini \
|
||||
|
||||
%files
|
||||
%doc %{_docdir}/%{name}
|
||||
%if %{GTS}
|
||||
%exclude %{_bindir}/smyrna
|
||||
%exclude %{_mandir}/man1/smyrna.1*
|
||||
%endif
|
||||
%{_bindir}/*
|
||||
%dir %{_libdir}/graphviz
|
||||
%{_libdir}/*.so.*
|
||||
%{_libdir}/graphviz/*.so.*
|
||||
%exclude %{_mandir}/man1/smyrna.1*
|
||||
%{_mandir}/man1/*.1*
|
||||
%{_mandir}/man7/*.7*
|
||||
%dir %{_datadir}/%{name}
|
||||
@ -616,17 +650,21 @@ php --no-php-ini \
|
||||
%doc %{_docdir}/%{name}/*.pdf
|
||||
%doc %{_docdir}/%{name}/demo
|
||||
|
||||
%if %{GTS}
|
||||
%files smyrna
|
||||
%{_bindir}/smyrna
|
||||
%{_datadir}/%{name}/smyrna
|
||||
%{_mandir}/man1/smyrna.1*
|
||||
%endif
|
||||
|
||||
%files gd
|
||||
%{_libdir}/graphviz/libgvplugin_gd.so.*
|
||||
|
||||
%if %{with gtk2}
|
||||
%files gtk2
|
||||
%{_libdir}/graphviz/libgvplugin_gtk.so.*
|
||||
%{_libdir}/graphviz/libgvplugin_gdk.so.*
|
||||
%endif
|
||||
|
||||
%files graphs
|
||||
%dir %{_datadir}/graphviz
|
||||
@ -716,8 +754,80 @@ php --no-php-ini \
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Oct 24 2022 David Abdurachmanov <davidlt@rivosinc.com> - 5.0.0-4.rvre0
|
||||
- Rebuilt for Fedora/RISCV (riscv64)
|
||||
* 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
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (graphviz-5.0.0.tar.bz2) = 65d7340321ea4741bfef54671df3e8afb6cb0cc3351b6199c9c6f8f6832b2abfc95c30995628d035cccceaab93f089daa48e6f389ea538ed4b5688d8219a49d5
|
||||
SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad
|
||||
|
Loading…
Reference in New Issue
Block a user