packages/metrics
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!27 Fix build error for sphinx 7.0

Browse Source 
From: @lyn1001 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
This commit is contained in:
openeuler-ci-bot 2023-08-02 08:50:35 +00:00 committed by Gitee
commit 691a702181
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Fix-build-error-for-sphinx-7.0.patch Normal file
View File

@ -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 %}
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css"/>
{%- endfor %}
- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css"/>
+ <link rel="stylesheet" href="{{ pathto('_static/', styles) }}" type="text/css"/>
{%- if favicon %}
<link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
{%- endif %}

7
metrics.spec
View File

@ -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 <thistleslyn@163.com> - 3.1.2-2
- Fix build error for sphinx 7.0
* Sat Sep 19 2020 huanghaitao <huanghaitao8@huawei.com> - 3.1.2-1
- package init