From 854fabe0c7ac75c801e42db015743504de2c8676466e4ca0e7097966757539e9 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 9 Feb 2018 08:20:54 +0000
Subject: [PATCH] Accepting request 574353 from home:kukuk:branches:Base:System

- Exclude some directories from fs-var.conf which are already part
  of systemd [bsc#1078466].
- Remove obsolete, outdated or duplicate directories:
  /lib/YaST, /lib/lsb, /srv/ftp, /usr/lib/lsb, /usr/share/nls and
  /usr/share/tmac.

OBS-URL: https://build.opensuse.org/request/show/574353
OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=158
---
 directory.list     | 6 ------
 filesystem.changes | 9 +++++++++
 filesystem.spec    | 1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/directory.list b/directory.list
index f795634..dac5533 100644
--- a/directory.list
+++ b/directory.list
@@ -38,8 +38,6 @@
 0755 root root /etc/xinetd.d
 0755 root root /home
 0755 root root /lib
-0755 root root /lib/YaST
-0755 root root /lib/lsb
 0755 root root /lib/modules
 0755 root root /lib/firmware
 0755 root root /mnt
@@ -51,7 +49,6 @@
 0755 root root /run
 0755 root root /sbin
 0755 root root /selinux
-0755 root root /srv/ftp
 0755 root root /srv/www
 0755 root root /srv/www/cgi-bin
 0755 root root /srv/www/htdocs
@@ -63,7 +60,6 @@
 0755 root root /usr/include/X11
 0755 root root /usr/lib
 0755 root root /usr/lib/X11
-0755 root root /usr/lib/lsb
 0755 root root /usr/lib/pkgconfig
 0755 root root /usr/lib/browser-plugins
 0755 root root /usr/lib/restricted
@@ -129,7 +125,6 @@
 0755 root root /usr/share/java
 0755 root root /usr/share/fonts
 0755 root root /usr/share/games
-0755 root root /usr/share/nls
 0755 root root /usr/share/pixmaps
 0755 root root /usr/share/pkgconfig
 0755 root root /usr/share/sgml
@@ -138,7 +133,6 @@
 0755 root root /usr/share/omc
 0755 root root /usr/share/omc/svcinfo.d
 0755 root root /usr/share/themes
-0755 root root /usr/share/tmac
 0755 root root /usr/share/xml
 0755 root root /usr/share/xml/docbook
 0755 root root /usr/share/xsessions
diff --git a/filesystem.changes b/filesystem.changes
index a445d7a..3fa0b19 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Feb  8 13:56:45 CET 2018 - kukuk@suse.de
+
+- Exclude some directories from fs-var.conf which are already part 
+  of systemd [bsc#1078466].
+- Remove obsolete, outdated or duplicate directories:
+  /lib/YaST, /lib/lsb, /srv/ftp, /usr/lib/lsb, /usr/share/nls and
+  /usr/share/tmac.
+
 -------------------------------------------------------------------
 Tue Feb  6 07:13:19 CET 2018 - kukuk@suse.de
 
diff --git a/filesystem.spec b/filesystem.spec
index 09d4524..ff73679 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -61,6 +61,7 @@ function create_dir () {
     mkdir -m $MODE $RPM_BUILD_ROOT/$NAME
     echo "$XTRA%%dir %%attr($MODE,$OWNR,$GRUP) $NAME" >> filesystem.list
     case "$NAME" in
+	/var/log|/var/cache) continue ;;
 	/var/*)
 	    echo "d $NAME $MODE $OWNR -" >> fs-var.conf
 	    ;;