rpm/filesystem
SHA256
1
0
Fork 0
forked from pool/filesystem
Code Pull Requests Activity

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

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2019-06-06 18:19:29 +00:00 committed by Git OBS Bridge
parent 347c51254e
commit 91b411966c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
filesystem.changes
View File

@ -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 Thu May 17 15:19:29 CEST 2018 - ro@suse.de

9
filesystem.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package filesystem # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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) Version: %(echo %suse_version | cut -b-2).%(echo %suse_version | cut -b3)
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: aaa_dir < %version-%release
Provides: aaa_dir = %version-%release
Requires: group(root) Requires: group(root)
Requires: user(root) Requires: user(root)
Url: https://build.opensuse.org/package/show/openSUSE:Factory/filesystem Url: https://build.opensuse.org/package/show/openSUSE:Factory/filesystem
@ -61,7 +59,6 @@ function create_dir () {
mkdir -m $MODE $RPM_BUILD_ROOT/$NAME mkdir -m $MODE $RPM_BUILD_ROOT/$NAME
echo "$XTRA%%dir %%attr($MODE,$OWNR,$GRUP) $NAME" >> filesystem.list echo "$XTRA%%dir %%attr($MODE,$OWNR,$GRUP) $NAME" >> filesystem.list
case "$NAME" in case "$NAME" in
/var/log|/var/cache) continue ;;
/var/*) /var/*)
echo "d $NAME $MODE $OWNR -" >> fs-var.conf echo "d $NAME $MODE $OWNR -" >> fs-var.conf
;; ;;
@ -207,7 +204,7 @@ test -n "$NON_EXISTING_DIR" && {
echo NON_EXISTING_DIR=$NON_EXISTING_DIR echo NON_EXISTING_DIR=$NON_EXISTING_DIR
exit 1 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> %pretrans -p <lua>
os.remove ("/usr/include/X11") os.remove ("/usr/include/X11")