From 92d26fd7389568a706916865c50985e9b82bfaba Mon Sep 17 00:00:00 2001
From: Phil Knirsch <pknirsch@fedoraproject.org>
Date: Tue, 27 May 2008 15:28:03 +0000
Subject: [PATCH] - First round of Fedora package review changes (#225752)

---
 filesystem.spec | 55 +++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/filesystem.spec b/filesystem.spec
index 584c06d..94bcaae 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.14
+Version: 2.4.15
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -18,6 +18,8 @@ the directories.
 %prep
 rm -f $RPM_BUILD_DIR/filelist
 
+%build
+
 %install
 rm -rf %{buildroot}
 mkdir %{buildroot}
@@ -25,9 +27,9 @@ mkdir %{buildroot}
 cd %{buildroot}
 
 mkdir -p mnt/{floppy,cdrom} \
-	bin boot dev \
-	etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,xinetd.d,skel,sysconfig,pki,fonts/conf.d,news} \
-	home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \
+        bin boot dev \
+        etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,xinetd.d,skel,sysconfig,pki,fonts/conf.d,news} \
+        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,fonts,games,gnome,icons,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},src,src/kernels} \
         var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
 
@@ -35,33 +37,33 @@ ln -snf ../var/tmp usr/tmp
 ln -snf spool/mail var/mail
 
 grep -v "^$" /usr/share/iso-codes/iso_639.tab | grep -v "^#" | while read a b c d ; do
-	[[ "$d" =~ "^Reserved" ]] && continue
-	[[ "$d" =~ "^No linguistic" ]] && continue
-	
-	locale=$c
-	if [ "$locale" = "XX" ]; then
-		locale=$b
-	fi
-	echo "%lang(${locale})	/usr/share/locale/${locale}" >> $RPM_BUILD_DIR/filelist
+    [[ "$d" =~ "^Reserved" ]] && continue
+    [[ "$d" =~ "^No linguistic" ]] && continue
+
+    locale=$c
+    if [ "$locale" = "XX" ]; then
+        locale=$b
+    fi
+    echo "%lang(${locale})	/usr/share/locale/${locale}" >> $RPM_BUILD_DIR/filelist
 done
 cat %{SOURCE1} | grep -v "^#" | grep -v "^$" | while read loc ; do
-	locale=$loc
-	locality=
-	[[ "$locale" =~ "@" ]] && locale=${locale%%@*}
-	[[ "$locale" =~ "_" ]] && locality=${locale##*_}
+    locale=$loc
+    locality=
+    [[ "$locale" =~ "@" ]] && locale=${locale%%@*}
+    [[ "$locale" =~ "_" ]] && locality=${locale##*_}
 
-	# If the locality is not official, skip it
-	if [ -n "$locality" ]; then
-		grep -q "^$locality" /usr/share/iso-codes/iso_3166.tab || continue
-	fi
-	# If the locale is not official, skip it
-	egrep -q "[[:space:]]${locale%_*}[[:space:]]" /usr/share/iso-codes/iso_639.tab || continue
-	echo "%lang(${locale})	/usr/share/locale/${loc}" >> $RPM_BUILD_DIR/filelist
+    # If the locality is not official, skip it
+    if [ -n "$locality" ]; then
+        grep -q "^$locality" /usr/share/iso-codes/iso_3166.tab || continue
+    fi
+    # If the locale is not official, skip it
+    egrep -q "[[:space:]]${locale%_*}[[:space:]]" /usr/share/iso-codes/iso_639.tab || continue
+    echo "%lang(${locale})	/usr/share/locale/${loc}" >> $RPM_BUILD_DIR/filelist
 done
 
 
 cat $RPM_BUILD_DIR/filelist | while read a b ; do
-	mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
+    mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES
 done
 
 %clean
@@ -136,6 +138,9 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Tue May 27 2008 Phil Knirsch <pknirsch@redhat.com> - 2.4.15-1
+- First round of Fedora package review changes (#225752)
+
 * Tue May 20 2008 Phil Knirsch <pknirsch@redhat.com> - 2.4.14-1
 - Added /usr/src/kernels to owned and created dirs (#442283)
 
@@ -353,7 +358,7 @@ rm -rf %{buildroot}
 * Thu Jun 01 2000 Preston Brown <pbrown@redhat.com>
 - add /var/spool/lpd to filesystem, owned by user/group lp, tight permissions
 
-* Tue May 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
+* Tue May 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - Added /etc/xinetd.d
 
 * Mon May 15 2000 Preston Brown <pbrown@redhat.com>