Accepting request 597110 from Base:System

- Skip cron job for cleaning /var/cache/man as there exists
  /usr/lib/tmpfiles.d/man-db.conf

OBS-URL: https://build.opensuse.org/request/show/597110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2018-04-22 12:31:35 +00:00 committed by Git OBS Bridge
commit 73055eb847
3 changed files with 7 additions and 46 deletions

View File

@ -1,42 +0,0 @@
#!/bin/sh
#
#
# clean_catman. This script was split off cron.daily
# Please add your local changes to cron.daily.local
# since this file will be overwritten, when updating your system.
#
# Copyright (c) 1996-2002 SuSE GmbH Nuernberg, Germany.
#
# please send bugfixes or comments to feedback@suse.de.
#
# Author: Burchard Steinbild <feedback@suse.de>, 1996
# Florian La Roche <feedback@suse.de>, 1996
#
#
# paranoia settings
#
umask 022
PATH=/sbin:/bin:/usr/sbin:/usr/bin
export PATH
if [ -f /etc/sysconfig/cron ] ; then
. /etc/sysconfig/cron
fi
#
# Delete too old preformatted man-pages.
#
if test "$DELETE_OLD_CATMAN" = yes ; then
if test -z "$CATMAN_ATIME" ; then
# Default is 7 days
CATMAN_ATIME=7
fi
test -e /var/cache/man -a -x /usr/bin/safe-rm && \
find /var/cache/man -name '*.gz' -type f -atime +$CATMAN_ATIME -print0 | \
xargs --no-run-if-empty --max-lines=200 --null -- /usr/bin/safe-rm
fi
exit 0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 16 14:25:43 UTC 2018 - werner@suse.de
- Skip cron job for cleaning /var/cache/man as there exists
/usr/lib/tmpfiles.d/man-db.conf
-------------------------------------------------------------------
Thu Dec 7 17:33:26 CET 2017 - kukuk@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package man
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -59,7 +59,6 @@ Requires(pre): group(man)
Source: http://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz
Source1: sysconfig.cron-man
Source2: cron.daily.do_mandb
Source3: cron.daily.clean_catman
Source4: mancoding
Source5: wrapper.c
Source6: man-rpmlintrc
@ -240,7 +239,6 @@ fi
mkdir -p %{buildroot}/etc/cron.daily
install -m 0644 %{SOURCE1} %{buildroot}%{_fillupdir}
install -m 0744 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-do_mandb
install -m 0744 %{SOURCE3} %{buildroot}/etc/cron.daily/suse-clean_catman
mkdir -p %{buildroot}%{_unitdir}/
install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/
@ -272,7 +270,6 @@ test -d /var/cache/man && mandb --quiet --create ||:
%doc ChangeLog
%doc %{_datadir}/doc/packages/man/man-db-manual.*
%config /etc/manpath.config
%attr(0744,root,root) /etc/cron.daily/suse-clean_catman
%attr(0744,root,root) /etc/cron.daily/suse-do_mandb
%{_bindir}/apropos
%{_bindir}/catman