Accepting request 699626 from Base:System
- Make systemd timers and services optional but hold them enabled as maybe in future all packages providing manual pages might use a posttrans scriplet to trigger a refresh of the man db (boo#1133762). - remove %verify(not group) from /var/cache/man, the inconsistent permissions are fixed in the permissions package (boo#1133678) OBS-URL: https://build.opensuse.org/request/show/699626 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
fdf392927e
13
man.changes
13
man.changes
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 30 10:57:35 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Make systemd timers and services optional but hold them enabled
|
||||
as maybe in future all packages providing manual pages might use
|
||||
a posttrans scriplet to trigger a refresh of the man db (boo#1133762).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 30 09:09:19 UTC 2019 - lnussel@suse.de
|
||||
|
||||
- remove %verify(not group) from /var/cache/man, the inconsistent
|
||||
permissions are fixed in the permissions package (boo#1133678)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 8 13:12:07 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
||||
27
man.spec
27
man.spec
@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@ -21,6 +21,8 @@
|
||||
%define _fillupdir /var/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
%bcond_without sdtimer
|
||||
|
||||
Name: man
|
||||
BuildRequires: automake
|
||||
BuildRequires: flex
|
||||
@ -35,6 +37,7 @@ BuildRequires: libzio-devel
|
||||
BuildRequires: man-pages
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: po4a
|
||||
BuildRequires: systemd
|
||||
BuildRequires: update-alternatives
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
@ -59,6 +62,7 @@ Requires(pre): user(man)
|
||||
Requires(pre): group(man)
|
||||
Requires(post): update-alternatives
|
||||
Requires(preun): update-alternatives
|
||||
Requires(posttrans): systemd
|
||||
Source: http://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz
|
||||
Source1: sysconfig.cron-man
|
||||
Source2: cron.daily.do_mandb
|
||||
@ -261,30 +265,35 @@ fi
|
||||
%else
|
||||
install -m 0744 %{SOURCE2} %{buildroot}/%{_libexecdir}/man-db/do_mandb
|
||||
%endif
|
||||
%if %{with sdtimer}
|
||||
install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/
|
||||
%if 0%{suse_version} >= 1500
|
||||
install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/
|
||||
install -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%find_lang man-db --all-name --with-man
|
||||
|
||||
%pre
|
||||
test -d var/catman/ && rm -rf var/catman/ || true
|
||||
%if %{with sdtimer}
|
||||
%if 0%{suse_version} >= 1500
|
||||
%service_add_pre man-db-create.service mandb.service mandb.timer
|
||||
%else
|
||||
%service_add_pre man-db-create.service
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%post
|
||||
%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf}
|
||||
%{fillup_only -an cron}
|
||||
/sbin/ldconfig
|
||||
%if %{with sdtimer}
|
||||
%service_add_post man-db-create.service
|
||||
%if 0%{suse_version} >= 1500
|
||||
%service_add_post mandb.service mandb.timer
|
||||
%endif
|
||||
%endif
|
||||
# Remark: soelim(1) is part of package groff or mandoc and
|
||||
# makewhatis(8) is part of package makewaht or mandoc
|
||||
%{_sbindir}/update-alternatives --quiet --force \
|
||||
@ -296,10 +305,12 @@ test -d var/catman/ && rm -rf var/catman/ || true
|
||||
--slave %{_mandir}/man1/whatis.1%{?ext_man} whatis.1%{?ext_man} %{_mandir}/man1/whatis-db.1%{?ext_man}
|
||||
|
||||
%preun
|
||||
%if %{with sdtimer}
|
||||
%service_del_preun man-db-create.service
|
||||
%if 0%{suse_version} >= 1500
|
||||
%service_del_preun mandb.service mandb.timer
|
||||
%endif
|
||||
%endif
|
||||
if test $1 -eq 0
|
||||
then
|
||||
%{_sbindir}/update-alternatives --quiet --remove man %{_bindir}/man
|
||||
@ -307,13 +318,19 @@ fi
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%if %{with sdtimer}
|
||||
%service_del_postun man-db-create.service
|
||||
%if 0%{suse_version} >= 1500
|
||||
%service_del_postun mandb.service mandb.timer
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%posttrans
|
||||
test -d /var/cache/man && mandb --quiet --create ||:
|
||||
%{?tmpfiles_create:%tmpfiles_create %{_libexecdir}/tmpfiles.d/man-db.conf}
|
||||
if test -d %{_localstatedir}/cache/man
|
||||
then
|
||||
mandb --quiet --create || :
|
||||
fi
|
||||
|
||||
%files -f man-db.lang
|
||||
%defattr(-,root,root)
|
||||
@ -354,11 +371,13 @@ test -d /var/cache/man && mandb --quiet --create ||:
|
||||
%dir %{_libexecdir}/tmpfiles.d
|
||||
%endif
|
||||
%{_libexecdir}/tmpfiles.d/man-db.conf
|
||||
%if %{with sdtimer}
|
||||
%{_unitdir}/man-db-create.service
|
||||
%if 0%{suse_version} >= 1500
|
||||
%{_unitdir}/mandb.service
|
||||
%{_unitdir}/mandb.timer
|
||||
%endif
|
||||
%endif
|
||||
%dir %{_datadir}/groff/site-tmac
|
||||
%{_datadir}/groff/site-tmac/tmac.andb
|
||||
%{_datadir}/groff/site-tmac/tmac.andocdb
|
||||
@ -370,6 +389,6 @@ test -d /var/cache/man && mandb --quiet --create ||:
|
||||
%dir %{_mandir}/tr
|
||||
%{_fillupdir}/sysconfig.cron-man
|
||||
%defattr(-,man,man)
|
||||
%ghost %verify(not group) %{_localstatedir}/cache/man
|
||||
%ghost %{_localstatedir}/cache/man
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user