From 259e2b20cb14be58e7c019ed0a15d263946400be Mon Sep 17 00:00:00 2001
From: Ondřej Vašík <ovasik@redhat.com>
Date: Sep 11 2013 15:20:03 +0000
Subject: sync with Fedora Rawhide


---

diff --git a/filesystem.spec b/filesystem.spec
index 8d852f1..b64fe95 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: 16%{?dist}
+Release: 20%{?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,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} \
+        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} \
         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.
@@ -118,6 +118,7 @@ posix.mkdir("/usr/bin")
 posix.mkdir("/usr/sbin")
 posix.mkdir("/usr/lib")
 posix.mkdir("/usr/lib/debug")
+posix.mkdir("/usr/lib/debug/usr/")
 posix.mkdir("/usr/%{_lib}")
 posix.symlink("usr/bin", "/bin")
 posix.symlink("usr/sbin", "/sbin")
@@ -125,10 +126,10 @@ posix.symlink("usr/lib", "/lib")
 posix.symlink("usr/bin", "/usr/lib/debug/bin")
 posix.symlink("usr/lib", "/usr/lib/debug/lib")
 posix.symlink("usr/%{_lib}", "/usr/lib/debug/%{_lib}")
+posix.symlink("../.dwz", "/usr/lib/debug/usr/.dwz")
 posix.symlink("usr/sbin", "/usr/lib/debug/sbin")
 posix.symlink("usr/%{_lib}", "/%{_lib}")
 posix.mkdir("/run")
-posix.mkdir("/var")
 posix.symlink("../run", "/var/run")
 posix.symlink("../run/lock", "/var/lock")
 return 0
@@ -166,7 +167,6 @@ return 0
 %attr(1777,root,root) /tmp
 %dir /usr
 %attr(555,root,root) /usr/bin
-/usr/etc
 /usr/games
 /usr/include
 %dir %attr(555,root,root) /usr/lib
@@ -185,6 +185,7 @@ return 0
 %attr(555,root,root) /usr/sbin
 %dir /usr/share
 /usr/share/aclocal
+/usr/share/appdata
 /usr/share/applications
 /usr/share/augeas
 /usr/share/backgrounds
@@ -233,6 +234,18 @@ return 0
 /var/yp
 
 %changelog
+* Wed Sep 11 2013 Richard Hughes <rhughes@redhat.com> - 3.2-20
+- Add /usr/share/appdata
+
+* Wed Aug 07 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-19
+- drop the ownership of /usr/etc
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sun Jun 30 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-17
+- .dwz symlink is needed as well (#974130)
+
 * Wed Jun 20 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-16
 - /var/run and /var/lock can't be in payload for some reason