From 42a3e2999b6a2c95c190e49dcae667927de00a38de848122470c6d4614552227 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 24 Nov 2017 11:49:09 +0000
Subject: [PATCH 1/2] Accepting request 544805 from
 home:RBrownSUSE:branches:Publishing:TeXLive

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

OBS-URL: https://build.opensuse.org/request/show/544805
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-filesystem?expand=0&rev=84
---
 texlive-filesystem.changes |  6 ++++++
 texlive-filesystem.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/texlive-filesystem.changes b/texlive-filesystem.changes
index 43f0627..a7138e2 100644
--- a/texlive-filesystem.changes
+++ b/texlive-filesystem.changes
@@ -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
 
diff --git a/texlive-filesystem.spec b/texlive-filesystem.spec
index 5ec8a20..1f7efb6 100644
--- a/texlive-filesystem.spec
+++ b/texlive-filesystem.spec
@@ -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_previous 2016
 %define texlive_release  20170520
@@ -13878,8 +13883,8 @@ popd
     install -m 0644 %{S:31} %{buildroot}%{_sysconfdir}/skel/.dvipsrc
 
     # install config stuff
-    mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-    install -m 0644 %{S:10} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.texlive
+    mkdir -p %{buildroot}%{_fillupdir}
+    install -m 0644 %{S:10} %{buildroot}%{_fillupdir}/sysconfig.texlive
 
     install -m 0755 %{S:11} %{buildroot}%{_texmfdistdir}/texconfig/update
 
@@ -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}/dist/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
 
 %files -n texlive-scheme-basic

From ae98e1d8135d824b0b2fb30b0a26d9d3edc95488d540929b10b8b03ea5a8aa5b Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 24 Nov 2017 11:59:07 +0000
Subject: [PATCH 2/2] .

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-filesystem?expand=0&rev=85
---
 texlive-filesystem.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/texlive-filesystem.spec b/texlive-filesystem.spec
index 1f7efb6..105814b 100644
--- a/texlive-filesystem.spec
+++ b/texlive-filesystem.spec
@@ -13930,8 +13930,8 @@ do
     test ! -e ${dir}/ls-R || continue
     echo '%% ls-R -- filename database for kpathsea; do not change this line.' > \
     ${dir}/ls-R
-    chown root:%{texgrp} ${dir}/ls-R
-    chmod 0664 ${dir}/ls-R
+    chown root:%{texgrp} ${dir}/ls-R || :
+    chmod 0664 ${dir}/ls-R || :
 done
 %if %{defined set_permissions}
 %set_permissions %{_texmfconfdir}/ls-R