From 0f2257ec05e2adf5168fdb1cda9fc743ff1ea7ca Mon Sep 17 00:00:00 2001 From: zhang__3125 <13466585422@163.com> Date: Wed, 1 Dec 2021 16:38:28 +0800 Subject: [PATCH] Fix #I41BDY;Remove dist from Release --- prometheus2.spec | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/prometheus2.spec b/prometheus2.spec index 91d7a6f..ef03212 100644 --- a/prometheus2.spec +++ b/prometheus2.spec @@ -2,7 +2,7 @@ Name: prometheus2 Version: 2.20.0 -Release: 1%{?dist} +Release: 2 Summary: The Prometheus 2.x monitoring system and time series database. License: ASL 2.0 URL: https://prometheus.io @@ -15,9 +15,10 @@ Conflicts: prometheus %global hostarch amd64 %endif -Source0: prometheus-%{version}.linux-%{hostarch}.tar.gz -Source1: prometheus.service -Source2: prometheus.default +Source0: prometheus-%{version}.linux-arm64.tar.gz +Source1: prometheus-%{version}.linux-amd64.tar.gz +Source2: prometheus.service +Source3: prometheus.default %{?systemd_requires} Requires(pre): shadow-utils @@ -29,7 +30,13 @@ configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true. %prep -%setup -q -n prometheus-%{version}.linux-%{hostarch} + +%ifarch aarch64 +%setup -b0 -n prometheus-%{version}.linux-%{hostarch} +%endif +%ifarch x86_64 +%setup -b1 -n prometheus-%{version}.linux-%{hostarch} +%endif %build /bin/true @@ -45,8 +52,8 @@ for dir in console_libraries consoles; do done done install -D -m 644 prometheus.yml %{buildroot}%{_sysconfdir}/prometheus/prometheus.yml -install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/prometheus.service -install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/default/prometheus +install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/prometheus.service +install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/default/prometheus %pre getent group prometheus >/dev/null || groupadd -r prometheus @@ -76,5 +83,9 @@ exit 0 %dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus %changelog +* Wed Dec 1 2021 zhanglin - 2.20.0-2 +- Fix https://gitee.com/src-openeuler/prometheus/issues/I41BDY?from=project-issue +- Remove %{?dist} from Release + * Tue Aug 11 2020 houjian - 2.20.0-1 - Init project prometheus -- Gitee