File project.diff of Package prometheus-apache_exporter
--- _service.orig
+++ _service
@@ -1,10 +1,10 @@
<services>
- <service name="obs_scm" mode="manual">
+ <service name="obs_scm" mode="disabled">
<param name="url">https://github.com/Lusitaniae/apache_exporter</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="revision">v1.0.8</param>
+ <param name="revision">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
<service name="tar" mode="buildtime"/>
@@ -12,10 +12,10 @@
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
- <service name="set_version" mode="manual">
+ <service name="set_version" mode="disabled">
<param name="basename">apache_exporter</param>
</service>
- <service name="go_modules" mode="manual">
- <param name="archive">apache_exporter-1.0.8.obscpio</param>
+ <service name="go_modules" mode="disabled">
+ <param name="archive">apache_exporter-*.obscpio</param>
</service>
</services>
--- golang-github-lusitaniae-apache_exporter.changes.orig
+++ golang-github-lusitaniae-apache_exporter.changes
@@ -36,33 +36,32 @@ Thu Aug 8 10:25:11 UTC 2024 - Witek Bed
-------------------------------------------------------------------
Mon Jul 8 07:30:16 UTC 2024 - Witek Bedyk <witold.bedyk@suse.com>
-- Migrate from `disabled` to `manual` source service type
-- Drop BuildRequires: golang-packaging
-- Upgrade to version 1.0.8 (bsc#1227341)
- * Update prometheus/client_golang to version 1.19.1
- * Update x/net to version 0.23.0
-- Upgrade to version 1.0.7
- * Update protobuf to version 1.33.0
- * Update prometheus/client_golang to version 1.19.0
- * Update prometheus/common to version 0.46.0
- * Standardize landing page
-- Upgrade to version 1.0.6
- * Update prometheus/exporter-toolkit to version 0.11.0
- * Update prometheus/client_golang to version 1.18.0
- * Add User-Agent header
-- Upgrade to version 1.0.4
- * Update x/crypto to version 0.17.0
- * Update alecthomas/kingpin/v2 to version 2.4.0
- * Update prometheus/common to version 0.45.0
-- Upgrade to version 1.0.3
- * Update prometheus/client_golang to version 1.17.0
- * Update x/net 0.17.0
-- Upgrade to version 1.0.2
- * Fix security bug in x/net dependency (CVE-2023-3978)
-- Upgrade to version 1.0.1
- * Update prometheus/exporter-toolkit to version 0.10.0
- * Update prometheus/common to version 0.44.0
- * Update prometheus/client_golang to version 1.16.0
+- Update to version 1.0.8
+
+-------------------------------------------------------------------
+Fri Jun 21 21:15:49 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
+
+- Add service ordering to avoid failure if started before the network during boot
+
+-------------------------------------------------------------------
+Mon Apr 15 06:48:53 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
+
+- Rename binary for consistency with other exporters
+
+-------------------------------------------------------------------
+Mon Apr 15 06:38:57 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
+
+- Bundle sysconfig file to allow for custom arguments
+
+-------------------------------------------------------------------
+Mon Apr 15 06:11:29 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
+
+- Update to version 1.0.7
+ * major version jump, reference commits
+- Build as position independent and strip debug symbols
+ * add promu.patch.yml
+- Provide prometheus(apache_exporter)
+- No longer pin version in _service
-------------------------------------------------------------------
Tue Nov 21 15:05:11 UTC 2023 - Marina Latini <marina.latini@suse.com>
--- golang-github-lusitaniae-apache_exporter.spec.orig
+++ golang-github-lusitaniae-apache_exporter.spec
@@ -55,14 +55,19 @@ URL: http://%{githubrepo}
Source: %{upstreamname}-%{version}.tar.gz
Source1: vendor.tar.gz
Source2: %{targetname}.service
-Source3: apparmor-usr.bin.%{targetname}
+Source3: %{targetname}.apparmor
+Source4: %{targetname}.sysconfig
+Patch0: promu.yml.patch
+Provides: prometheus(%{upstreamname})
BuildRequires: fdupes
BuildRequires: golang-github-prometheus-promu
+BuildRequires: golang-packaging
%if 0%{?rhel}
BuildRequires: golang >= 1.20
Requires(pre): shadow-utils
%else
BuildRequires: golang(API) >= 1.20
+Requires(post): %fillup_prereq
Requires(pre): shadow
%if %{with apparmor}
%if %{with apparmor_reload}
@@ -81,13 +86,14 @@ ExcludeArch: s390
Exports apache mod_status statistics via HTTP for Prometheus consumption.
%prep
-%autosetup -a1 -n %{upstreamname}-%{version}
+%autosetup -a1 -n %{upstreamname}-%{version} -p1
%build
-GOPATH=%{_builddir}/go promu build -v
+%goprep %{githubrepo}
+GOPATH=%{_builddir}/go promu build
%install
-install -D -m 0755 %{_builddir}/%{upstreamname}-%{version}/%{upstreamname}-%{version} %{buildroot}/%{_bindir}/%{targetname}
+install -D -m 0755 %{_builddir}/%{upstreamname}-%{version}/%{upstreamname}-%{version} %{buildroot}/%{_bindir}/%{upstreamname}
install -d -m 0755 %{buildroot}%{_unitdir}
install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}
install -d -m 0755 %{buildroot}%{_sbindir}
@@ -95,8 +101,9 @@ ln -s %{_sbindir}/service %{buildroot}%{
%if %{with apparmor}
# AppArmor profile
mkdir -p %{buildroot}%{_sysconfdir}/apparmor.d
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/usr.bin.%{targetname}
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/%{targetname}
%endif
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{targetname}
%check
%if 0%{?rhel}
@@ -116,9 +123,10 @@ getent passwd %{serviceuser} >/dev/null
%if 0%{?rhel}
%systemd_post %{targetname}.service
%else
+%fillup_only -n %{targetname}
%service_add_post %{targetname}.service
%if %{with apparmor_reload}
-%apparmor_reload %{_sysconfdir}/apparmor.d/usr.bin.%{targetname}
+%apparmor_reload %{_sysconfdir}/apparmor.d/%{targetname}
%endif
%endif
@@ -140,12 +148,13 @@ getent passwd %{serviceuser} >/dev/null
%defattr(-,root,root,-)
%doc README.md
%license LICENSE
-%{_bindir}/%{targetname}
+%{_bindir}/%{upstreamname}
%{_unitdir}/%{targetname}.service
%{_sbindir}/rc%{targetname}
%if %{with apparmor}
%dir %{_sysconfdir}/apparmor.d
-%config %{_sysconfdir}/apparmor.d/usr.bin.%{targetname}
+%config %{_sysconfdir}/apparmor.d/%{targetname}
%endif
+%{_fillupdir}/sysconfig.%{targetname}
%changelog
--- prometheus-apache_exporter.service.orig
+++ prometheus-apache_exporter.service
@@ -1,12 +1,13 @@
[Unit]
Description=Prometheus exporter for Apache metrics
Documentation=https://github.com/lusitaniae/apache_exporter
+After=network.target
[Service]
Restart=always
User=prometheus
-Environment=ARGS=
-ExecStart=/usr/bin/prometheus-apache_exporter $ARGS
+EnvironmentFile=-/etc/sysconfig/prometheus-apache_exporter
+ExecStart=/usr/bin/apache_exporter $ARGS
ExecReload=/bin/kill -HUP $MAINPID
TimeoutStopSec=20s
SendSIGKILL=no
