Add support for Image Mode

mrtg.spec

@@ -1,12 +1,13 @@
 %global _use_internal_dependency_generator 0
 
 %global contentdir       %{_localstatedir}/www/%{name}
+%global factory_contentdir     %{_datadir}/factory/var/www/%{name}
 %global libdir           %{_localstatedir}/lib/mrtg
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.17.7
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5
@@ -40,6 +41,7 @@ BuildRequires: make
 BuildRequires: gd-devel, libpng-devel
 BuildRequires: perl-generators
 BuildRequires: systemd-units
+BuildRequires: systemd-rpm-macros
 BuildRequires: gcc
 
 %global __find_requires %{SOURCE3}
@@ -52,10 +54,10 @@ images which provide a LIVE visual representation of this traffic.
 
 %prep
 %setup -q
-%patch0 -p1 -b .lib64
-%patch1 -p1 -b .socket6
-%patch2 -p1 -b .ifhighspeed
-%patch3 -p1 -b .traffic-sum-man-option
+%patch -P 0 -p1 -b .lib64
+%patch -P 1 -p1 -b .socket6
+%patch -P 2 -p1 -b .ifhighspeed
+%patch -P 3 -p1 -b .traffic-sum-man-option
 
 for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do
     iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -80,13 +82,11 @@ rm -rf   $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mrtg
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/mrtg
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lock/mrtg
-mkdir -p $RPM_BUILD_ROOT%{contentdir}
+mkdir -p $RPM_BUILD_ROOT%{factory_contentdir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 
-install -m 644 images/*   $RPM_BUILD_ROOT%{contentdir}/
-sed 's,@CONTENTDIR@,%{contentdir},g; s,@LIBDIR@,%{_localstatedir}/lib/mrtg,g' \
+install -m 644 images/*   $RPM_BUILD_ROOT%{factory_contentdir}/
+sed 's,@CONTENTDIR@,%{contentdir},g; s,@LIBDIR@,%{libdir},g' \
     %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg
 
@@ -108,14 +108,13 @@ done
 sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1
 
 %post
-install -d -m 0755 -o root -g root /var/lock/mrtg
 restorecon /var/lock/mrtg
 %systemd_post mrtg.service
 
 %preun
 if [ $1 -eq 0 ]; then
   # Package removal, not upgrade
-  rm -rf /var/lock/mrtg
+  rm -rf %{_localstatedir}/lock/mrtg
 fi
 %systemd_preun mrtg.service
 
@@ -128,20 +127,25 @@ fi
 %dir %{_sysconfdir}/mrtg
 %config(noreplace) %{_sysconfdir}/mrtg/mrtg.cfg
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mrtg.conf
-%{contentdir}
+%{factory_contentdir}
 %{_bindir}/*
 %{_libdir}/mrtg2
 %exclude %{_libdir}/mrtg2/Pod
 %{_mandir}/*/*
 %exclude %{_datadir}/mrtg2/icons
 %exclude %{_datadir}/doc/mrtg2
-%dir %{_localstatedir}/lib/mrtg
+%ghost %dir %{libdir}
+%ghost %dir %{contentdir}
 %{_tmpfilesdir}/mrtg.conf
-%ghost /var/lock/mrtg
+%ghost %dir %{_localstatedir}/lock/mrtg
 %{_unitdir}/mrtg.service
 %{_unitdir}/mrtg.timer
 
 %changelog
+* Mon Jan 26 2026 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-12
+- Add support for Image Mode
+  Resolves: RHEL-142950
+
 * Mon Feb 05 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-11
 - Remove obsolete syslog references from service file
   Resolves: RHEL-19644

mrtg.tmpfiles

@@ -1 +1,4 @@
 d /var/lock/mrtg 0755 root root -
+d /var/lib/mrtg 0755 root root -
+# populate /var/www/mrtg with content from /usr/share/factory/var/www/mrtg
+C /var/www/mrtg - - - -