diff --git a/prometheus2.spec b/prometheus2.spec index 664287171b19d0c930ef6d7de86a9de2823ac5cf..d1a8263162429a09576debd4ade39e1aa7da8692 100644 --- a/prometheus2.spec +++ b/prometheus2.spec @@ -2,22 +2,16 @@ Name: prometheus2 Version: 2.20.0 -Release: 3 +Release: 4 Summary: The Prometheus 2.x monitoring system and time series database. License: ASL 2.0 URL: https://prometheus.io Conflicts: prometheus -%ifarch aarch64 -%global hostarch arm64 -%endif -%ifarch x86_64 -%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 BuildRequires: systemd %{?systemd_requires} @@ -30,7 +24,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 -q -b 0 -n prometheus-%{version}.linux-arm64 +%endif + +%ifarch x86_64 +%setup -q -b 1 -n prometheus-%{version}.linux-amd64 +%endif %build /bin/true @@ -44,10 +44,11 @@ for dir in console_libraries consoles; do for file in ${dir}/*; do install -D -m 644 ${file} %{buildroot}%{_datarootdir}/prometheus/${file} 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 @@ -77,6 +78,9 @@ exit 0 %dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus %changelog +* Mon Jan 09 2023 tianhang - 2.20.0-4 +- cherry pick commit c18e334 to fix compilation failure + - Thu Mar 24 2022 yaoxin - 2.20.0-3 - Delete release %{?dist}