diff --git a/filesystem.spec b/filesystem.spec index c55b5d1..661eef3 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -1,6 +1,6 @@ Summary: The basic directory layout for a Linux system Name: filesystem -Version: 2.4.27 +Version: 2.4.28 Release: 1%{?dist} License: Public Domain URL: https://fedorahosted.org/filesystem @@ -14,6 +14,8 @@ BuildRequires: iso-codes # Can be removed after f14 or so Provides: xorg-x11-filesystem = 7.3-6 Obsoletes: xorg-x11-filesystem < 7.3-6 +Provides: pm-utils-filesytem = 1.2.5-6 +Obsoletes: pm-utils-filesytem < 1.2.5-6 %description The filesystem package is one of the basic packages that is installed @@ -34,9 +36,9 @@ cd %{buildroot} mkdir -p mnt/{floppy,cdrom} \ bin boot dev \ - etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,xinetd.d,skel,sysconfig,pki} \ + 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 \ - usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale},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/{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,themes,xsessions,X11},src,src/kernels,src/debug} \ + usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{games,locale},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/{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} ln -snf ../var/tmp usr/tmp @@ -81,7 +83,7 @@ cat $RPM_BUILD_DIR/filelist | grep "locale" | while read a b ; do done cat $RPM_BUILD_DIR/filelist | grep "/share/man" | while read a b c d; do - mkdir -p -m 755 %{buildroot}/$d + 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 @@ -138,6 +140,7 @@ rm -rf %{buildroot} /usr/share/misc /usr/share/omf /usr/share/pixmaps +/usr/share/sounds /usr/share/themes /usr/share/xsessions /usr/share/X11 @@ -164,6 +167,12 @@ rm -rf %{buildroot} /var/yp %changelog +* Wed Aug 05 2009 Ondrej Vasik 2.4.28-1 +- Provide/obsolete pm-utils-filesystem, own dirs for pm-utils + hooks(#515362) +- Do own man sections for /usr/share/man/ dirs (#220265) +- Do own /usr/share/sounds (#515485) + * Tue Aug 04 2009 Adam Jackson 2.4.27-1 - Prov/Obs: xorg-x11-filesystem