From dd06d6014d4ed5c858dec738532587ae283e07d4 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Wed, 8 Jul 2009 12:24:52 +0000
Subject: [PATCH] do own interface description directory
 /usr/share/idl(#451719), add a few     missing lang-exceptions to
 filelist(#508309)

---
 filesystem.spec | 19 +++++++++++++++----
 lang-exceptions |  8 ++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/filesystem.spec b/filesystem.spec
index df78713..962292d 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.21
+Version: 2.4.22
 Release: 1%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
@@ -32,7 +32,7 @@ mkdir -p mnt/{floppy,cdrom} \
         bin boot dev \
         etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,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,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,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,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} \
+        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,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},src,src/kernels} \
         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
@@ -51,15 +51,21 @@ done
 cat %{SOURCE1} | grep -v "^#" | grep -v "^$" | while read loc ; do
     locale=$loc
     locality=
+    special=
     [[ "$locale" =~ "@" ]] && locale=${locale%%@*}
     [[ "$locale" =~ "_" ]] && locality=${locale##*_}
+    [[ "$locality" =~ "." ]] && locality=${locality%%.*}
+    [[ "$loc" =~ "_" ]] || [[ "$loc" =~ "@" ]] || special=$loc
 
     # 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
+    # If the locale is not official and not special, skip it
+    if [ -z "$special" ]; then
+        egrep -q "[[:space:]]${locale%_*}[[:space:]]" \
+           /usr/share/iso-codes/iso_639.tab || continue
+    fi
     echo "%lang(${locale})	/usr/share/locale/${loc}" >> $RPM_BUILD_DIR/filelist
 done
 
@@ -110,6 +116,7 @@ rm -rf %{buildroot}
 /usr/share/ghostscript
 /usr/share/gnome
 /usr/share/icons
+/usr/share/idl
 /usr/share/info
 %dir /usr/share/locale
 /usr/share/man
@@ -142,6 +149,10 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Wed Jul 08 2009 Ondrej Vasik <ovasik@redhat.com> - 2.4.22-1
+- do own interface description directory /usr/share/idl(#451719)
+- add a few missing lang-exceptions to filelist(#508309)
+
 * Wed Mar 04 2009 Phil Knirsch <pknirsch@redhat.com> - 2.4.21-1
 - Added /usr/share/backgrounds (#487957)
 - Added /usr/share/ghostscript/{conf.d} (#302521)
diff --git a/lang-exceptions b/lang-exceptions
index ee24681..a62e47b 100644
--- a/lang-exceptions
+++ b/lang-exceptions
@@ -12,12 +12,14 @@ am_ET
 ast_ES
 az_IR
 bn_IN
+ca@valencia
 ca_ES
 ca_ES@valencian
 cs_CZ
 de_AT
 de_CH
 de_DE
+default
 el_GR
 en_AU
 en_CA
@@ -54,8 +56,10 @@ it_CH
 it_IT
 ja_JP
 ko_KR
+ks@devanagari
 my_MM
 nb_NO
+nds_DE
 nl_BE
 nl_NL
 pl_PL
@@ -66,13 +70,17 @@ sl_SI
 sq_AL
 sv_SE
 uk_UA
+ur_PK
 zh_CN
 zh_HK
 zh_TW
+zh_TW.Big5
 en@boldquot
 en@quot
 nds@NFE
 sr@ije
 sr@latin
+sr@Latn
+uz@cyrillic
 uz@Latn
 be@latin