Accepting request 544369 from home:kukuk:branches:Base:System

- Fix incomplete /usr/X11R6 drop from 2013

- Create fs-var.conf for systemd-tmpfiles, which contains all 
  directories and links below /var. This is needed for systems,
  which use transactional update, read-only root filesystem, or
  other things, where either /var is not available during upgrade
  or does not survive a reboot. So that systemd-tmpfiles could
  create them at next boot.
- Drop deprecated /usr/tmp compat link

OBS-URL: https://build.opensuse.org/request/show/544369
OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=154

directory.list64

@@ -3,4 +3,3 @@
 0755 root root /usr/lib64/pkgconfig
 0755 root root /usr/lib64/browser-plugins
 0755 root root /usr/local/lib64
-0755 root root /usr/X11R6/lib64

filesystem.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Nov 22 11:26:13 CET 2017 - kukuk@suse.de
+
+- Fix incomplete /usr/X11R6 drop from 2013
+
+-------------------------------------------------------------------
+Tue Nov 21 16:55:26 CET 2017 - kukuk@suse.de
+
+- Create fs-var.conf for systemd-tmpfiles, which contains all 
+  directories and links below /var. This is needed for systems,
+  which use transactional update, read-only root filesystem, or
+  other things, where either /var is not available during upgrade
+  or does not survive a reboot. So that systemd-tmpfiles could
+  create them at next boot.
+- Drop deprecated /usr/tmp compat link
+
 -------------------------------------------------------------------
 Wed Nov  8 14:22:03 UTC 2017 - rbrown@suse.com
 

filesystem.links

@@ -1,5 +1,4 @@
 # links to be created
-../var/tmp		/usr/tmp
 # Required for FHS 2.1
 spool/mail		/var/mail
 # systemd

filesystem.spec

@@ -60,6 +60,11 @@ function create_dir () {
     test -n "$BDIR" -a ! -d $RPM_BUILD_ROOT$BDIR && create_dir 0755 root root $BDIR
     mkdir -m $MODE $RPM_BUILD_ROOT/$NAME
     echo "$XTRA%%dir %%attr($MODE,$OWNR,$GRUP) $NAME" >> filesystem.list
+    case "$NAME" in
+	/var/*)
+	    echo "d $NAME $MODE $OWNR -" >> fs-var.conf
+	    ;;
+    esac
 }
 mkdir -p $RPM_BUILD_ROOT
 # generic directories first
@@ -122,7 +127,7 @@ while read SRC DEST ; do
 case $SRC in
  "") continue ;;
  \#*) echo "comment: $SRC $DEST" ;;
- *) 
+ *)
     case $SRC in
 	/*) test -d $RPM_BUILD_ROOT/$SRC || { echo "link src does not exist" ; exit 1 ; }
 	    ;;
@@ -134,6 +139,10 @@ case $SRC in
 	/var/run|/var/lock) echo "%ghost $DEST" >> filesystem.list ;;
 	*) echo "$DEST" >> filesystem.list ;;
     esac
+    # for tmpfiles.d
+    case  $DEST in
+	/var/*) echo "L $DEST - - - - $SRC" >> fs-var.conf ;;
+    esac
     ;;
 esac
 done < %{SOURCE1}
@@ -197,6 +206,7 @@ test -n "$NON_EXISTING_DIR" && {
     echo NON_EXISTING_DIR=$NON_EXISTING_DIR
     exit 1
 }
+install fs-var.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/fs-var.conf
 
 %pretrans -p <lua>
 os.remove ("/usr/include/X11")
@@ -209,5 +219,6 @@ if not posix.stat("/var/lock") then
 end
 
 %files -f filesystem.list
+/usr/lib/tmpfiles.d/fs-var.conf
 
 %changelog