From 48218232fca30ae354b20a9b6f5bbe38945fca3d Mon Sep 17 00:00:00 2001 From: Phil Knirsch Date: Fri, 25 May 2007 15:16:13 +0000 Subject: [PATCH] - Fixed description to avoid trademark issues (#234093) --- filesystem.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index baeb7fb..7910b31 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.6 +Version: 2.4.8 Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -11,9 +11,9 @@ BuildRequires: iso-codes %description The filesystem package is one of the basic packages that is installed -on a Red Hat Linux system. Filesystem contains the basic directory -layout for a Linux operating system, including the correct permissions -for the directories. +on a Linux system. Filesystem contains the basic directory layout +for a Linux operating system, including the correct permissions for +the directories. %prep rm -f $RPM_BUILD_DIR/filelist @@ -26,9 +26,9 @@ cd %{buildroot} mkdir -p mnt/{floppy,cdrom} \ bin boot dev \ - etc/{X11/{applnk,sysconfig,serverconfig},xdg,xdg/menus,xdg/autostart,opt,xinetd.d,skel,sysconfig,pki} \ + etc/{X11/{applnk,sysconfig,serverconfig},xdg/autostart,opt,xinetd.d,skel,sysconfig,pki,fonts/conf.d}, \ 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,X11},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,desktop-directories,dict,doc,empty,games,gtk-doc,icons,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},mime-info,misc,pixmaps,omf,xsessions},src} \ + usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11},lib/{games,locale,X11},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,desktop-directories,dict,doc,empty,games,gtk-doc,icons,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},mime-info,misc,omf,pixmaps,themes,xsessions},src} \ 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 @@ -108,8 +108,9 @@ rm -rf %{buildroot} /usr/share/man /usr/share/mime-info /usr/share/misc -/usr/share/pixmaps /usr/share/omf +/usr/share/pixmaps +/usr/share/themes /usr/share/xsessions /usr/src %dir /var @@ -134,6 +135,13 @@ rm -rf %{buildroot} /var/yp %changelog +* Fri May 25 2007 Phil Knirsch 2.4.8-1 +- Fixed description to avoid trademark issues (#234093) + +* Thu May 24 2007 Phil Knirsch 2.4.7-1 +- Added /etc/fonts/conf.d and /usr/share/themes (#239246) +- Removed /etc/xdg/menus, already owned by redhat-menus (#228779) + * Tue Apr 17 2007 Phil Knirsch - 2.4.6-1 - Added several more /usr/share directories (#222905)