Accepting request 545149 from Publishing:TeXLive

- Replace references to /var/adm/fillup-templates with new 
  %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/545149
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive-filesystem?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2017-11-30 11:40:57 +00:00 committed by Git OBS Bridge
commit 6b41f28c9b
2 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:51:29 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 23 09:52:35 UTC 2017 - werner@suse.de Mon Oct 23 09:52:35 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
%define texlive_version 2017 %define texlive_version 2017
%define texlive_previous 2016 %define texlive_previous 2016
%define texlive_release 20170520 %define texlive_release 20170520
@ -13878,8 +13883,8 @@ popd
install -m 0644 %{S:31} %{buildroot}%{_sysconfdir}/skel/.dvipsrc install -m 0644 %{S:31} %{buildroot}%{_sysconfdir}/skel/.dvipsrc
# install config stuff # install config stuff
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_fillupdir}
install -m 0644 %{S:10} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.texlive install -m 0644 %{S:10} %{buildroot}%{_fillupdir}/sysconfig.texlive
install -m 0755 %{S:11} %{buildroot}%{_texmfdistdir}/texconfig/update install -m 0755 %{S:11} %{buildroot}%{_texmfdistdir}/texconfig/update
@ -13925,8 +13930,8 @@ do
test ! -e ${dir}/ls-R || continue test ! -e ${dir}/ls-R || continue
echo '%% ls-R -- filename database for kpathsea; do not change this line.' > \ echo '%% ls-R -- filename database for kpathsea; do not change this line.' > \
${dir}/ls-R ${dir}/ls-R
chown root:%{texgrp} ${dir}/ls-R chown root:%{texgrp} ${dir}/ls-R || :
chmod 0664 ${dir}/ls-R chmod 0664 ${dir}/ls-R || :
done done
%if %{defined set_permissions} %if %{defined set_permissions}
%set_permissions %{_texmfconfdir}/ls-R %set_permissions %{_texmfconfdir}/ls-R
@ -24188,7 +24193,7 @@ rm -f /var/run/texlive/run-update
%ghost %config(noreplace) %attr(0664,root,%{texgrp}) %verify(not md5 size mtime mode) %{_texmfvardir}/ls-R %ghost %config(noreplace) %attr(0664,root,%{texgrp}) %verify(not md5 size mtime mode) %{_texmfvardir}/ls-R
%ghost %config(noreplace) %attr(0664,root,%{texgrp}) %verify(not md5 size mtime mode) %{_texmfvardir}/dist/ls-R %ghost %config(noreplace) %attr(0664,root,%{texgrp}) %verify(not md5 size mtime mode) %{_texmfvardir}/dist/ls-R
%ghost %config(noreplace) %attr(0664,root,%{texgrp}) %verify(not md5 size mtime mode) %{_texmfvardir}/main/ls-R %ghost %config(noreplace) %attr(0664,root,%{texgrp}) %verify(not md5 size mtime mode) %{_texmfvardir}/main/ls-R
%{_localstatedir}/adm/fillup-templates/sysconfig.texlive %{_fillupdir}/sysconfig.texlive
/var/adm/update-scripts/%{name}-%{version}-%{release}-zypper /var/adm/update-scripts/%{name}-%{version}-%{release}-zypper
%files -n texlive-scheme-basic %files -n texlive-scheme-basic