From 6348b7353f0f1171e41e830b0bdc657490259cb4 Mon Sep 17 00:00:00 2001 From: xiaoji <345865759@163.com> Date: Mon, 2 Sep 2024 15:22:33 +0800 Subject: [PATCH] deprecated python3-recommonmark from builddep --- deprecated-recommonmark.patch | 25 +++++++++++++++++++++++++ llvm.spec | 8 ++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 deprecated-recommonmark.patch diff --git a/deprecated-recommonmark.patch b/deprecated-recommonmark.patch new file mode 100644 index 0000000..b920e03 --- /dev/null +++ b/deprecated-recommonmark.patch @@ -0,0 +1,25 @@ +--- a/llvm/docs/conf.py 2024-09-02 15:08:42.392808121 +0800 ++++ b/llvm/docs/conf.py 2024-09-02 15:09:21.323150707 +0800 +@@ -36,21 +36,7 @@ + ".rst": "restructuredtext", + } + +-try: +- import recommonmark +-except ImportError: +- # manpages do not use any .md sources +- if not tags.has("builder-man"): +- raise +-else: +- import sphinx +- +- if sphinx.version_info >= (3, 0): +- # This requires 0.5 or later. +- extensions.append("recommonmark") +- else: +- source_parsers = {".md": "recommonmark.parser.CommonMarkParser"} +- source_suffix[".md"] = "markdown" ++import sphinx + + # The encoding of source files. + # source_encoding = 'utf-8-sig' diff --git a/llvm.spec b/llvm.spec index 7f775a1..d638072 100644 --- a/llvm.spec +++ b/llvm.spec @@ -2,7 +2,7 @@ Name: llvm Version: 17.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Low Level Virtual Machine, modular and reusable compiler and toolchain License: Apache License v2.0 with LLVM Exceptions URL: http://llvm.org @@ -27,6 +27,7 @@ Patch0011: 0010-Backport-Mips-MC-AttemptToFoldSymbolOffsetDifference-revert-isMi Patch0012: 0011-Backport-LoongArch-Add-the-support-for-vector-in-llvm17.patch Patch0013: 0012-Backport-LoongArch-improve-the-support-for-compiler-rt-and-bugfix.patch Patch0014: 0013-Backport-LoongArch-Improve-the-support-for-atomic-and-clear_cache.patch +Patch3000: deprecated-recommonmark.patch %define maj_ver %(echo %{version} | cut -d. -f1) %define min_ver %(echo %{version} | cut -d. -f2) @@ -34,7 +35,7 @@ Patch0014: 0013-Backport-LoongArch-Improve-the-support-for-atomic-and-clear_cach BuildRequires: gcc gcc-c++ clang cmake ninja-build BuildRequires: zlib-devel libffi-devel ncurses-devel binutils-devel libedit-devel -BuildRequires: python3-sphinx python3-recommonmark +BuildRequires: python3-sphinx # for valgrind support BuildRequires: valgrind-devel # fo patchfix.py @@ -248,6 +249,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} check-all -C %{_vpath_buildd %{_includedir}/llvm-gmock %changelog +* Mon Sep 02 2024 Zhao Zhen - 17.0.6-6 +- Deprecated python3-recommonmark from builddep + * Fri Aug 16 2024 OpenCloudOS Release Engineering - 17.0.6-5 - Rebuilt for loongarch release -- Gitee