From 6a7157a8bdd320b3143e78570240457ac478675f Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Jan 04 2023 06:58:37 +0000 Subject: modernize: replace `$RPM_BUILD_ROOT` with `%{buildroot}` --- diff --git a/apt-cacher-ng.spec b/apt-cacher-ng.spec index b9ac8fe..3f77604 100644 --- a/apt-cacher-ng.spec +++ b/apt-cacher-ng.spec @@ -57,34 +57,34 @@ find debian -type f -exec sed -i "s#/usr/lib/apt-cacher-ng#/usr/libexec/apt-cach %cmake_install ## add useful content from Debian packaging -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily -install -D -pm 0750 debian/apt-cacher-ng.cron.daily $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/apt-cacher-ng +mkdir -p %{buildroot}%{_sysconfdir}/cron.daily +install -D -pm 0750 debian/apt-cacher-ng.cron.daily %{buildroot}%{_sysconfdir}/cron.daily/apt-cacher-ng -install -D -pm 0644 debian/apt-cacher-ng.default $RPM_BUILD_ROOT%{_sysconfdir}/default/apt-cacher-ng +install -D -pm 0644 debian/apt-cacher-ng.default %{buildroot}%{_sysconfdir}/default/apt-cacher-ng -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -D -pm 0644 debian/apt-cacher-ng.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/apt-cacher-ng +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +install -D -pm 0644 debian/apt-cacher-ng.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/apt-cacher-ng ## systemd.service instead of init.d script -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/ +mkdir -p %{buildroot}/%{_unitdir} +install -pm 644 %{SOURCE2} %{buildroot}/%{_unitdir}/ ## /run/apt-cacher-ng -mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir} -install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_tmpfilesdir}/ -mkdir -p $RPM_BUILD_ROOT%{_rundir}/apt-cacher-ng +mkdir -p %{buildroot}/%{_tmpfilesdir} +install -pm 644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/ +mkdir -p %{buildroot}%{_rundir}/apt-cacher-ng -mkdir -p $RPM_BUILD_ROOT%{_var}/cache/apt-cacher-ng -mkdir -p $RPM_BUILD_ROOT%{_var}/lib/apt-cacher-ng -mkdir -p $RPM_BUILD_ROOT%{_var}/log/apt-cacher-ng +mkdir -p %{buildroot}%{_var}/cache/apt-cacher-ng +mkdir -p %{buildroot}%{_var}/lib/apt-cacher-ng +mkdir -p %{buildroot}%{_var}/log/apt-cacher-ng # without this I would only get 404 for every single request -sed -i '/^Remap-debrep/s/;/# ;/' $RPM_BUILD_ROOT%{_sysconfdir}/apt-cacher-ng/acng.conf -sed -i '/^Remap-uburep/s/;/# ;/' $RPM_BUILD_ROOT%{_sysconfdir}/apt-cacher-ng/acng.conf -sed -i '/^Remap-kxlrep/s/;/# ;/' $RPM_BUILD_ROOT%{_sysconfdir}/apt-cacher-ng/acng.conf +sed -i '/^Remap-debrep/s/;/# ;/' %{buildroot}%{_sysconfdir}/apt-cacher-ng/acng.conf +sed -i '/^Remap-uburep/s/;/# ;/' %{buildroot}%{_sysconfdir}/apt-cacher-ng/acng.conf +sed -i '/^Remap-kxlrep/s/;/# ;/' %{buildroot}%{_sysconfdir}/apt-cacher-ng/acng.conf ## cleanup -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/apt-cacher-ng.service +rm -rf %{buildroot}%{_datadir}/doc %{buildroot}%{_sysconfdir}/avahi/services/apt-cacher-ng.service %pre getent group apt-cacher-ng > /dev/null || groupadd -r apt-cacher-ng