pool/squid
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 985780 from home:schubi2

Browse Source 
- 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
This commit is contained in:
Lars Vogdt 2022-06-29 17:56:59 +00:00 committed by Git OBS Bridge
parent 3db5ecbad9
commit 3d5852fb75
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
squid.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 29 11:31:00 UTC 2022 - Stefan Schubert <schubi@suse.com>
- 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 <adam.majer@suse.de> Fri Jun 24 09:26:49 UTC 2022 - Adam Majer <adam.majer@suse.de>

10
squid.spec
View File

@ -175,8 +175,14 @@ mv %{buildroot}{%{_sysconfdir}/%{name}/,%{_datadir}/%{name}/}mime.conf.default
ln -s %{_sysconfdir}/%{name}/mime.conf %{buildroot}%{_datadir}/%{name} # backward compatible ln -s %{_sysconfdir}/%{name}/mime.conf %{buildroot}%{_datadir}/%{name} # backward compatible
# install logrotate file # 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} \ install -Dpm 644 %{SOURCE7} \
%{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%endif
install -d -m 755 doc/scripts install -d -m 755 doc/scripts
install scripts/*.pl doc/scripts install scripts/*.pl doc/scripts
@ -315,7 +321,11 @@ fi
%config(noreplace) %{squidconfdir}/cachemgr.conf %config(noreplace) %{squidconfdir}/cachemgr.conf
%config(noreplace) %{squidconfdir}/errorpage.css %config(noreplace) %{squidconfdir}/errorpage.css
%config(noreplace) %{squidconfdir}/errors %config(noreplace) %{squidconfdir}/errors
%if 0%{?suse_version} > 1500
%{_distconfdir}/logrotate.d/%{name}
%else
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%endif
%config(noreplace) %{squidconfdir}/mime.conf %config(noreplace) %{squidconfdir}/mime.conf
%config(noreplace) %{squidconfdir}/%{name}.conf %config(noreplace) %{squidconfdir}/%{name}.conf
%config %{squidconfdir}/cachemgr.conf.default %config %{squidconfdir}/cachemgr.conf.default