From 519230f9de0996aaf9ef01a291e58f9205a72abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 12 Jan 2023 12:57:28 +0100 Subject: [PATCH] New version Resovles: rhbz#2158703 --- graphviz-7.0.5-fix-python-3.12.patch | 21 --------------------- graphviz-7.0.6-fix-python-3.12.patch | 13 +++++++++++++ graphviz.spec | 10 +++++++--- sources | 2 +- 4 files changed, 21 insertions(+), 25 deletions(-) delete mode 100644 graphviz-7.0.5-fix-python-3.12.patch create mode 100644 graphviz-7.0.6-fix-python-3.12.patch diff --git a/graphviz-7.0.5-fix-python-3.12.patch b/graphviz-7.0.5-fix-python-3.12.patch deleted file mode 100644 index 7b61a0e..0000000 --- a/graphviz-7.0.5-fix-python-3.12.patch +++ /dev/null @@ -1,21 +0,0 @@ -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,,[ diff --git a/graphviz-7.0.6-fix-python-3.12.patch b/graphviz-7.0.6-fix-python-3.12.patch new file mode 100644 index 0000000..1cd864a --- /dev/null +++ b/graphviz-7.0.6-fix-python-3.12.patch @@ -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,,[ diff --git a/graphviz.spec b/graphviz.spec index 4d3a6b3..60f184b 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -87,8 +87,8 @@ Name: graphviz Summary: Graph Visualization Tools -Version: 7.0.5 -Release: 3%{?dist} +Version: 7.0.6 +Release: 1%{?dist} License: EPL-1.0 URL: http://www.graphviz.org/ Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 @@ -189,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.5-fix-python-3.12.patch +Patch1: graphviz-7.0.6-fix-python-3.12.patch %if ! %{JAVA} Obsoletes: graphviz-java < %{version}-%{release} @@ -744,6 +744,10 @@ php --no-php-ini \ %endif %changelog +* Thu Jan 12 2023 Jaroslav Škarvada - 7.0.6-1 +- New version + Resovles: rhbz#2158703 + * Fri Jan 06 2023 Tomas Popela - 7.0.5-3 - Don't build GTK 2 bits on ELN/RHEL 10 as GTK 2 won't be available there diff --git a/sources b/sources index 596a237..2d69ea9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (graphviz-7.0.5.tar.bz2) = 81b7f25676ec1f160d96a1f7238f3323a037d223f82a956e910f9de693bbaac86b5e4f717aaf66d49aa31609b2d23742d7634d2213b23555313389e71367c5e9 +SHA512 (graphviz-7.0.6.tar.bz2) = db32365f25d027a95b84e1c404d16375411a84eb657a230bb4fa799e92813cc0ae686ee40ffd3f01dc3fc9416b7cbd2ee0475a489d0a228cec6ec9111e93c356