From 09d6778e3efbc1998219f26c7a3a932204218b2b Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Wed, 2 Aug 2023 15:41:09 +0800 Subject: [PATCH] Fix build error for sphinx 7.0 --- Fix-build-error-for-sphinx-7.0.patch | 12 ++++++++++++ metrics.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Fix-build-error-for-sphinx-7.0.patch diff --git a/Fix-build-error-for-sphinx-7.0.patch b/Fix-build-error-for-sphinx-7.0.patch new file mode 100644 index 0000000..18e645b --- /dev/null +++ b/Fix-build-error-for-sphinx-7.0.patch @@ -0,0 +1,12 @@ +diff -Nur a/docs/source/_themes/metrics/layout.html b/docs/source/_themes/metrics/layout.html +--- a/docs/source/_themes/metrics/layout.html 2015-04-26 11:55:19.000000000 +0800 ++++ b/docs/source/_themes/metrics/layout.html 2023-08-02 15:17:19.255362367 +0800 +@@ -19,7 +19,7 @@ + {%- for cssfile in css_files %} + + {%- endfor %} +- ++ + {%- if favicon %} + + {%- endif %} diff --git a/metrics.spec b/metrics.spec index 5c48401..dd1a964 100644 --- a/metrics.spec +++ b/metrics.spec @@ -1,6 +1,6 @@ Name: metrics Version: 3.1.2 -Release: 1 +Release: 2 Summary: Java library which gives you what your code does in production License: ASL 2.0 URL: http://metrics.dropwizard.io @@ -8,6 +8,7 @@ Source0: https://github.com/dropwizard/metrics/archive/v%{version}.t Patch0: metrics-3.1.2-amqp-client35.patch Patch1: metrics-3.1.2-ehcache-core.patch Patch2: delete-jersey1-module.patch +Patch3: Fix-build-error-for-sphinx-7.0.patch BuildRequires: maven-local mvn(ch.qos.logback:logback-classic) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.google.guava:guava) BuildRequires: mvn(com.rabbitmq:amqp-client) jersey @@ -182,6 +183,7 @@ find . -name "*.jar" -type f -delete %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %pom_disable_module metrics-jetty8 %pom_disable_module metrics-jetty9 %pom_disable_module metrics-jetty9-legacy @@ -295,5 +297,8 @@ rm -rf docs/target/singlehtml/.buildinfo %endif %changelog +* Wed Aug 2 2023 liyanan - 3.1.2-2 +- Fix build error for sphinx 7.0 + * Sat Sep 19 2020 huanghaitao - 3.1.2-1 - package init -- Gitee