Author: glen Date: Thu Jun 4 21:36:02 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- let FHS being installed as first pkg
- remove group marks for mount points (pointless)
- other groups handled in %post via <lua>
- FHS is now first installed pkg
- rel 25
---- Files affected:
packages/FHS:
FHS.spec (1.134 -> 1.135)
---- Diffs:
================================================================
Index: packages/FHS/FHS.spec
diff -u packages/FHS/FHS.spec:1.134 packages/FHS/FHS.spec:1.135
--- packages/FHS/FHS.spec:1.134 Tue Apr 14 08:01:09 2009
+++ packages/FHS/FHS.spec Thu Jun 4 23:35:56 2009
@@ -1,7 +1,8 @@
# $Revision$, $Date$
# NOTE
# - don't use %{_*dir} macros for paths defined by FHS
-
+# - do not add any dependencies to this pkg, FHS should be the first package
being installed
+# - do not use any other user/group than "root", as then we have to depend on
"setup" package.
Summary: Basic FHS 2.3 filesystem layout
Summary(de.UTF-8): Grundlegende Dateisystemstruktur
Summary(fr.UTF-8): Arborescence de base du système de fichiers
@@ -9,13 +10,13 @@
Summary(tr.UTF-8): Temel dosya sistemi yapısı
Name: FHS
Version: 2.3
-Release: 24
+Release: 25
License: GPL
Group: Base
URL: http://www.pathname.com/fhs/
BuildRequires: mktemp
BuildRequires: rpmbuild(macros) >= 1.213
-Requires: setup >= 2.4.6-4
+Conflicts: setup < 2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# nothing to put there
@@ -31,6 +32,11 @@
%define no_install_post_chrpath 1
%define no_install_post_compress_modules 1
+# we have to use numeric uids/groups. see comment above
+
+%define gid_uucp 14
+%define gid_mail 12
+
%description
This package contains the basic directory layout for a Linux system,
including the proper permissions for the directories. This layout
@@ -106,6 +112,11 @@
}
check_filesystem_dirs
+# XXX: it is 2009, what uucp?! but we use /var/lock/subsys, so change it just
to root?
+%post -p <lua>
+posix.chown("/var/mail", 0, %{gid_mail})
+posix.chown("/var/lock", 0, %{gid_uucp})
+
%files
%defattr(644,root,root,755)
%dir /
@@ -118,12 +129,12 @@
%dir /home
%dir /lib
%dir /lib/modules
-%attr(775,root,disk) %dir /media
-%attr(775,root,disk) /media/floppy
-%attr(775,root,disk) /media/cdrom
+%attr(775,root,root) %dir /media
+%attr(775,root,root) %verify(not group) /media/floppy
+%attr(775,root,root) %verify(not group) /media/cdrom
%dir /mnt
%dir /opt
-%attr(555,root,proc) %verify(not group) /proc
+%attr(555,root,root) %verify(not group) /proc
%attr(700,root,root) /root
%dir /sbin
%attr(755,root,root) /srv
@@ -199,9 +210,9 @@
%dir /var/lib
%dir /var/lib/misc
%dir /var/local
-%attr(1771,root,uucp) %dir /var/lock
+%attr(1771,root,root) %dir /var/lock
%attr(751,root,root) /var/log
-%attr(2775,root,mail) /var/mail
+%attr(2775,root,root) /var/mail
%dir /var/opt
%dir /var/run
%dir /var/spool
@@ -220,6 +231,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.135 2009/06/04 21:35:56 glen
+- let FHS being installed as first pkg
+- remove group marks for mount points (pointless)
+- other groups handled in %post via <lua>
+- FHS is now first installed pkg
+- rel 25
+
Revision 1.134 2009/04/14 06:01:09 glen
- skip debuginfo package
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/FHS/FHS.spec?r1=1.134&r2=1.135&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
