From 91b411966cf453cdf137b7e90345d6ccc589382c6a22082cac6b79cb88cc5999 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 6 Jun 2019 18:19:29 +0000
Subject: [PATCH] Accepting request 705685 from home:kukuk:branches:Base:System

- Re-add /var/cache and /var/log (revert [bsc#1078466] because of
  [bsc#1078466])
- Fix permission of fs-var.conf

OBS-URL: https://build.opensuse.org/request/show/705685
OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=170
---
 filesystem.changes | 7 +++++++
 filesystem.spec    | 9 +++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/filesystem.changes b/filesystem.changes
index 6b7c127..8181444 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 27 15:47:56 CEST 2019 - kukuk@suse.de
+
+- Re-add /var/cache and /var/log (revert [bsc#1078466] because of
+  [bsc#1078466])
+- Fix permission of fs-var.conf
+
 -------------------------------------------------------------------
 Thu May 17 15:19:29 CEST 2018 - ro@suse.de
 
diff --git a/filesystem.spec b/filesystem.spec
index 007f563..cf80e1c 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package filesystem
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,8 +23,6 @@ Group:          System/Fhs
 Version:        %(echo %suse_version | cut -b-2).%(echo %suse_version | cut -b3)
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Obsoletes:      aaa_dir < %version-%release
-Provides:       aaa_dir = %version-%release
 Requires:       group(root)
 Requires:       user(root)
 Url:            https://build.opensuse.org/package/show/openSUSE:Factory/filesystem
@@ -61,7 +59,6 @@ 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
 	    ;;
@@ -207,7 +204,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
+install -m 0644  fs-var.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/fs-var.conf
 
 %pretrans -p <lua>
 os.remove ("/usr/include/X11")