From e82b9a62f749568089d0de1250e09ec5d9b36239 Mon Sep 17 00:00:00 2001
From: Ondřej Vašík <ovasik@redhat.com>
Date: Dec 04 2013 13:28:07 +0000
Subject: commit changes from rawhide


---

diff --git a/filesystem.spec b/filesystem.spec
index b64fe95..2358d24 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: 20%{?dist}
+Release: 22%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
 Group: System Environment/Base
@@ -34,7 +34,7 @@ cd %{buildroot}
 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 srv sys tmp \
-        usr/{bin,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,appdata,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} \
+        usr/{bin,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/usr,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,appdata,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,log,nis,preserve,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
 
 #do not create the symlink atm.
@@ -47,6 +47,11 @@ ln -snf usr/lib lib
 ln -snf usr/%{_lib} %{_lib}
 ln -snf ../run var/run
 ln -snf ../run/lock var/lock
+ln -snf usr/bin usr/lib/debug/bin
+ln -snf usr/lib usr/lib/debug/lib
+ln -snf usr/%{_lib} usr/lib/debug/%{_lib}
+ln -snf ../.dwz usr/lib/debug/usr/.dwz
+ln -snf usr/sbin usr/lib/debug/sbin
 
 sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml \
   >%{buildroot}/iso_639.tab
@@ -163,14 +168,20 @@ return 0
 /run
 /sbin
 /srv
-/sys
+%attr(555,root,root) /sys
 %attr(1777,root,root) /tmp
 %dir /usr
 %attr(555,root,root) /usr/bin
 /usr/games
 /usr/include
 %dir %attr(555,root,root) /usr/lib
-/usr/lib/debug
+%dir /usr/lib/debug
+%ghost /usr/lib/debug/bin
+%ghost /usr/lib/debug/lib
+%ghost /usr/lib/debug/%{_lib}
+%ghost /usr/lib/debug/usr
+%ghost /usr/lib/debug/usr/.dwz
+%ghost /usr/lib/debug/sbin
 %attr(555,root,root) /usr/lib/games
 %attr(555,root,root) /usr/lib/sse2
 %ifarch x86_64 ppc64 sparc64 s390x aarch64
@@ -234,6 +245,13 @@ return 0
 /var/yp
 
 %changelog
+* Wed Dec 04 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-22
+- change the permissions of the /sys directory to 555
+  to match the kernel (#1037862)
+
+* Mon Nov 18 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-21
+- add ownership for the /usr/lib/debug subdirs(#1031136)
+
 * Wed Sep 11 2013 Richard Hughes <rhughes@redhat.com> - 3.2-20
 - Add /usr/share/appdata