Compare commits
No commits in common. "7513cdf24843536b5723f29172c541ff6e048f96" and "8d8d1dd380552c84081d23ceb4c257f742730b4a" have entirely different histories.
7513cdf248
...
8d8d1dd380
|
|
@ -0,0 +1,21 @@
|
|||
diff -up graphviz-7.0.5/configure.ac.fixpy312 graphviz-7.0.5/configure.ac
|
||||
--- graphviz-7.0.5/configure.ac.fixpy312 2022-12-29 14:11:15.564390331 -0500
|
||||
+++ graphviz-7.0.5/configure.ac 2022-12-29 14:16:03.923297996 -0500
|
||||
@@ -1129,7 +1129,7 @@ else
|
||||
PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
|
||||
PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION
|
||||
PYTHON_LIBS="-undefined dynamic_lookup"
|
||||
- PYTHON_INSTALL_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(1,0))'`"
|
||||
+ PYTHON_INSTALL_DIR="`$PYTHON -c 'import sysconfig; print(sysconfig.get_path("platlib"))'`"
|
||||
save_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
|
||||
AC_CHECK_HEADER(Python.h,,[
|
||||
@@ -1189,7 +1189,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,,[
|
||||
|
|
@ -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,,[
|
||||
|
|
@ -9,12 +9,6 @@
|
|||
%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
|
||||
|
|
@ -93,8 +87,8 @@
|
|||
|
||||
Name: graphviz
|
||||
Summary: Graph Visualization Tools
|
||||
Version: 7.1.0
|
||||
Release: 2%{?dist}
|
||||
Version: 7.0.5
|
||||
Release: 3%{?dist}
|
||||
License: EPL-1.0
|
||||
URL: http://www.graphviz.org/
|
||||
Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
|
||||
|
|
@ -183,9 +177,7 @@ BuildRequires: poppler-glib-devel
|
|||
BuildRequires: freeglut-devel
|
||||
BuildRequires: libglade2-devel
|
||||
BuildRequires: gtkglext-devel
|
||||
%if %{without bootstrap}
|
||||
BuildRequires: doxygen
|
||||
%endif
|
||||
%if %{GOLANG}
|
||||
BuildRequires: golang
|
||||
%endif
|
||||
|
|
@ -197,7 +189,7 @@ 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
|
||||
Patch1: graphviz-7.0.5-fix-python-3.12.patch
|
||||
|
||||
%if ! %{JAVA}
|
||||
Obsoletes: graphviz-java < %{version}-%{release}
|
||||
|
|
@ -316,6 +308,7 @@ 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.
|
||||
|
|
@ -465,10 +458,7 @@ 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} \
|
||||
|
|
@ -754,26 +744,6 @@ php --no-php-ini \
|
|||
%endif
|
||||
|
||||
%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
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad
|
||||
SHA512 (graphviz-7.0.5.tar.bz2) = 81b7f25676ec1f160d96a1f7238f3323a037d223f82a956e910f9de693bbaac86b5e4f717aaf66d49aa31609b2d23742d7634d2213b23555313389e71367c5e9
|
||||
|
|
|
|||
Loading…
Reference in New Issue