From 140ffbab32c8b43ec9aa05308f3b1c3bead49afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik@redhat.com>
Date: Mon, 18 Mar 2013 16:42:19 +0100
Subject: [PATCH] revert the revert for #919374 - hopefully it will not break
 the buildroot again

---
 filesystem.spec | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/filesystem.spec b/filesystem.spec
index 83794a2..070a54a 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
 Version: 3.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
 Group: System Environment/Base
@@ -39,7 +39,7 @@ mkdir -p boot dev \
         etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki,bash_completion.d} \
         home media mnt opt proc root run/lock srv sys tmp \
         usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug,games,locale,modules,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/{adm,empty,gopher,lib/{games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp}
+        var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp}
 
 #do not create the symlink atm.
 #ln -snf etc/sysconfig etc/default
@@ -53,6 +53,9 @@ ln -snf usr/%{_lib} lib
 ln -snf usr/lib lib
 %endif
 ln -snf usr/%{_lib} %{_lib}
+ln -snf ../run var/run
+ln -snf ../run/lock var/lock
+mkdir var/lock/subsys
 
 sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml \
   >%{buildroot}/iso_639.tab
@@ -135,10 +138,6 @@ end
 
 return 0
 
-%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) /
@@ -225,14 +224,14 @@ posix.symlink("../run/lock", "/var/lock")
 /var/gopher
 /var/lib
 /var/local
-%ghost %dir %attr(755,root,root) /var/lock
+%attr(755,root,root) /var/lock
 %ghost /var/lock/subsys
 /var/log
 /var/mail
 /var/nis
 /var/opt
 /var/preserve
-%ghost %attr(755,root,root) /var/run
+%attr(755,root,root) /var/run
 %dir /var/spool
 %attr(755,root,root) /var/spool/lpd
 %attr(775,root,mail) /var/spool/mail
@@ -241,11 +240,7 @@ posix.symlink("../run/lock", "/var/lock")
 /var/yp
 
 %changelog
-* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-9
-- revert the change for previous build, breaking koji
-  builds
-
-* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-8
+* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-10
 - ship /var/run and /var/lock as symlinks in payload,
   don't handle them as part of post scriptlet (#919374)