Accepting request 545114 from Base:System

OBS-URL: https://build.opensuse.org/request/show/545114
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2017-11-25 07:40:41 +00:00 committed by Git OBS Bridge
commit ed581e5dae
2 changed files with 20 additions and 3 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 23 13:40:41 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Tue Nov 21 07:45:36 UTC 2017 - werner@suse.de
- Require package man-pages at build time for testing
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 16 10:00:30 UTC 2017 - werner@suse.de Thu Feb 16 10:00:30 UTC 2017 - werner@suse.de

View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%bcond_with wrapman %bcond_with wrapman
Name: man Name: man
@ -29,6 +34,7 @@ BuildRequires: less
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
BuildRequires: libpipeline-devel BuildRequires: libpipeline-devel
BuildRequires: libzio-devel BuildRequires: libzio-devel
BuildRequires: man-pages
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: po4a BuildRequires: po4a
BuildRequires: xz-devel BuildRequires: xz-devel
@ -229,9 +235,9 @@ fi
mkdir -p %{buildroot}%{_datadir}/groff/site-tmac mkdir -p %{buildroot}%{_datadir}/groff/site-tmac
install -m 0644 groff/tmac.andb %{buildroot}%{_datadir}/groff/site-tmac/ install -m 0644 groff/tmac.andb %{buildroot}%{_datadir}/groff/site-tmac/
install -m 0644 groff/tmac.andocdb %{buildroot}%{_datadir}/groff/site-tmac/ install -m 0644 groff/tmac.andocdb %{buildroot}%{_datadir}/groff/site-tmac/
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}/etc/cron.daily mkdir -p %{buildroot}/etc/cron.daily
install -m 0644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 0644 %{SOURCE1} %{buildroot}%{_fillupdir}
install -m 0744 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-do_mandb install -m 0744 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-do_mandb
install -m 0744 %{SOURCE3} %{buildroot}/etc/cron.daily/suse-clean_catman install -m 0744 %{SOURCE3} %{buildroot}/etc/cron.daily/suse-clean_catman
%find_lang man-db --all-name --with-man %find_lang man-db --all-name --with-man
@ -285,7 +291,7 @@ mandb --quiet --create
%doc %{_mandir}/man5/*.5.gz %doc %{_mandir}/man5/*.5.gz
%doc %{_mandir}/man8/*.8.gz %doc %{_mandir}/man8/*.8.gz
%dir %{_mandir}/id %dir %{_mandir}/id
%{_localstatedir}/adm/fillup-templates/sysconfig.cron-man %{_fillupdir}/sysconfig.cron-man
%defattr(-,man,man) %defattr(-,man,man)
%ghost %{_localstatedir}/cache/man/* %ghost %{_localstatedir}/cache/man/*