From 3d5852fb755866b3fcee3be1b6b66170b2dc79134ed49992c89da01be049a88a Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 29 Jun 2022 17:56:59 +0000 Subject: [PATCH] Accepting request 985780 from home:schubi2 - Moved logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d. OBS-URL: https://build.opensuse.org/request/show/985780 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=256 --- squid.changes | 6 ++++++ squid.spec | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/squid.changes b/squid.changes index 7cfe343..53362ab 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 29 11:31:00 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specific directory /etc/logrotate.d + to vendor specific directory /usr/etc/logrotate.d. + ------------------------------------------------------------------- Fri Jun 24 09:26:49 UTC 2022 - Adam Majer diff --git a/squid.spec b/squid.spec index 88ed8a8..be1c80a 100644 --- a/squid.spec +++ b/squid.spec @@ -175,8 +175,14 @@ mv %{buildroot}{%{_sysconfdir}/%{name}/,%{_datadir}/%{name}/}mime.conf.default ln -s %{_sysconfdir}/%{name}/mime.conf %{buildroot}%{_datadir}/%{name} # backward compatible # install logrotate file +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d +install -Dpm 644 %{SOURCE7} \ + %{buildroot}%{_distconfdir}/logrotate.d/%{name} +%else install -Dpm 644 %{SOURCE7} \ %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +%endif install -d -m 755 doc/scripts install scripts/*.pl doc/scripts @@ -315,7 +321,11 @@ fi %config(noreplace) %{squidconfdir}/cachemgr.conf %config(noreplace) %{squidconfdir}/errorpage.css %config(noreplace) %{squidconfdir}/errors +%if 0%{?suse_version} > 1500 +%{_distconfdir}/logrotate.d/%{name} +%else %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%endif %config(noreplace) %{squidconfdir}/mime.conf %config(noreplace) %{squidconfdir}/%{name}.conf %config %{squidconfdir}/cachemgr.conf.default