commit dcedf4575ad4279cf8f5542ea0bcac24adf82427
Author: Ondřej Vašík <ovasik(a)redhat.com>
Date: Fri Apr 1 09:25:34 2011 +0200
do /var/lock/subsys directory systemd way via tmpfiles.d conf file, add /run to
filesystem (#692124), minor spec file cleanup (thanks H.Hoyer)
filesystem.spec | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
---
diff --git a/filesystem.spec b/filesystem.spec
index 61a4836..389ff39 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,7 +1,7 @@
Summary: The basic directory layout for a Linux system
Name: filesystem
-Version: 2.4.37
-Release: 2%{?dist}
+Version: 2.4.39
+Release: 1%{?dist}
License: Public Domain
URL:
https://fedorahosted.org/filesystem
Group: System Environment/Base
@@ -9,7 +9,7 @@ Group: System Environment/Base
Source1:
https://fedorahosted.org/filesystem/browser/lang-exceptions
Source2: iso_639.sed
Source3: iso_3166.sed
-Requires(Pre): setup >= 2.5.4-1
+Source4: filesystem.conf
BuildRequires: iso-codes
%description
@@ -28,12 +28,14 @@ rm -rf %{buildroot}
mkdir %{buildroot}
install -p -c -m755 %SOURCE2 %{buildroot}/iso_639.sed
install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed
+mkdir -p %{buildroot}/etc/tmpfiles.d
+install -p -c -m644 %SOURCE4 %{buildroot}/etc/tmpfiles.d/filesystem.conf
cd %{buildroot}
mkdir -p bin boot dev \
etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki}
\
- home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \
+ home lib/modules %{_lib}/tls media mnt opt proc root run sbin selinux srv sys tmp
\
usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale,sse2},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug}
\
var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
@@ -91,20 +93,32 @@ cat $RPM_BUILD_DIR/filelist | grep "/share/man" | while read
a b c d; do
mkdir -p -m 755
%{buildroot}/$d/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}
done
-for i in `echo man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}`; do
+for i in man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p}; do
echo "/usr/share/man/$i" >>$RPM_BUILD_DIR/filelist
done
%clean
rm -rf %{buildroot}
+%post -p <lua>
+posix.symlink("../run", "/var/run")
+posix.symlink("../run/lock", "/var/lock")
+
%files -f filelist
%defattr(0755,root,root,-)
%dir %attr(555,root,root) /
%attr(555,root,root) /bin
%attr(555,root,root) /boot
/dev
-/etc
+%dir /etc
+/etc/X11
+/etc/xdg
+/etc/opt
+/etc/pm
+/etc/xinetd.d
+/etc/skel
+/etc/sysconfig
+/etc/pki
/home
%attr(555,root,root) /lib
%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x
@@ -115,6 +129,7 @@ rm -rf %{buildroot}
%dir /opt
%attr(555,root,root) /proc
%attr(550,root,root) /root
+/run
%attr(555,root,root) /sbin
/selinux
/srv
@@ -160,27 +175,36 @@ rm -rf %{buildroot}
/usr/src
/usr/tmp
%dir /var
+/var/cache
/var/db
+/var/empty
/var/games
/var/lib
/var/local
-%dir %attr(0755,root,root) /var/lock
-%attr(755,root,root) /var/lock/subsys
-/var/cache
-/var/empty
+%ghost %attr(755,root,root) /var/lock
+%ghost /var/lock/subsys
/var/log
/var/mail
/var/nis
/var/opt
/var/preserve
-/var/run
+%ghost %attr(755,root,root) /var/run
%dir /var/spool
%attr(755,root,root) /var/spool/lpd
%attr(775,root,mail) /var/spool/mail
%attr(1777,root,root) /var/tmp
/var/yp
+%config /etc/tmpfiles.d/filesystem.conf
%changelog
+* Thu Mar 31 2011 Ondrej Vasik <ovasik(a)redhat.com> 2.4-39-1
+- add /run to filesystem (#692124)
+- minor spec file cleanup
+
+* Fri Feb 25 2011 Ondrej Vasik <ovasik(a)redhat.com> 2.4.38-1
+- do /var/lock/subsys directory systemd way via tmpfiles.d conf file
+ (#656586)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild